A few implementation fixes in the notes API.
* mh/notes-duplicate-entries:
notes: avoid potential use-after-free during insertion
notes: avoid leaking duplicate entries
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
+*.bat eol=crlf
/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
/git-difftool
/git-difftool--helper
/git-describe
+/git-env--helper
/git-fast-export
/git-fast-import
/git-fetch
/git-range-diff
/git-read-tree
/git-rebase
-/git-rebase--am
-/git-rebase--common
-/git-rebase--interactive
/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
/git-request-pull
/git-rerere
/git-reset
+/git-restore
/git-rev-list
/git-rev-parse
/git-revert
/git-submodule
/git-submodule--helper
/git-svn
+/git-switch
/git-symbolic-ref
/git-tag
/git-unpack-file
*.user
*.idb
*.pdb
-/Debug/
-/Release/
+*.ilk
+*.iobj
+*.ipdb
+*.dll
+.vs/
+Debug/
+Release/
+/UpgradeLog*.htm
+/git.VC.VC.opendb
+/git.VC.db
*.dSYM
compiler:
addons:
before_install:
+ - env: jobname=linux-gcc-4.8
+ os: linux
+ dist: trusty
+ compiler:
- env: jobname=Linux32
os: linux
compiler:
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)
+TECH_DOCS += MyFirstContribution
TECH_DOCS += SubmittingPatches
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
--- /dev/null
+My First Contribution to the Git Project
+========================================
+:sectanchors:
+
+[[summary]]
+== Summary
+
+This is a tutorial demonstrating the end-to-end workflow of creating a change to
+the Git tree, sending it for review, and making changes based on comments.
+
+[[prerequisites]]
+=== Prerequisites
+
+This tutorial assumes you're already fairly familiar with using Git to manage
+source code. The Git workflow steps will largely remain unexplained.
+
+[[related-reading]]
+=== Related Reading
+
+This tutorial aims to summarize the following documents, but the reader may find
+useful additional context:
+
+- `Documentation/SubmittingPatches`
+- `Documentation/howto/new-command.txt`
+
+[[getting-started]]
+== Getting Started
+
+[[cloning]]
+=== Clone the Git Repository
+
+Git is mirrored in a number of locations. Clone the repository from one of them;
+https://git-scm.com/downloads suggests one of the best places to clone from is
+the mirror on GitHub.
+
+----
+$ git clone https://github.com/git/git git
+$ cd git
+----
+
+[[identify-problem]]
+=== Identify Problem to Solve
+
+////
+Use + to indicate fixed-width here; couldn't get ` to work nicely with the
+quotes around "Pony Saying 'Um, Hello'".
+////
+In this tutorial, we will add a new command, +git psuh+, short for ``Pony Saying
+`Um, Hello''' - a feature which has gone unimplemented despite a high frequency
+of invocation during users' typical daily workflow.
+
+(We've seen some other effort in this space with the implementation of popular
+commands such as `sl`.)
+
+[[setup-workspace]]
+=== Set Up Your Workspace
+
+Let's start by making a development branch to work on our changes. Per
+`Documentation/SubmittingPatches`, since a brand new command is a new feature,
+it's fine to base your work on `master`. However, in the future for bugfixes,
+etc., you should check that document and base it on the appropriate branch.
+
+For the purposes of this document, we will base all our work on the `master`
+branch of the upstream project. Create the `psuh` branch you will use for
+development like so:
+
+----
+$ git checkout -b psuh origin/master
+----
+
+We'll make a number of commits here in order to demonstrate how to send a topic
+with multiple patches up for review simultaneously.
+
+[[code-it-up]]
+== Code It Up!
+
+NOTE: A reference implementation can be found at
+https://github.com/nasamuffin/git/tree/psuh.
+
+[[add-new-command]]
+=== Adding a New Command
+
+Lots of the subcommands are written as builtins, which means they are
+implemented in C and compiled into the main `git` executable. Implementing the
+very simple `psuh` command as a built-in will demonstrate the structure of the
+codebase, the internal API, and the process of working together as a contributor
+with the reviewers and maintainer to integrate this change into the system.
+
+Built-in subcommands are typically implemented in a function named "cmd_"
+followed by the name of the subcommand, in a source file named after the
+subcommand and contained within `builtin/`. So it makes sense to implement your
+command in `builtin/psuh.c`. Create that file, and within it, write the entry
+point for your command in a function matching the style and signature:
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix)
+----
+
+We'll also need to add the declaration of psuh; open up `builtin.h`, find the
+declaration for `cmd_push`, and add a new line for `psuh` immediately before it,
+in order to keep the declarations sorted:
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix);
+----
+
+Be sure to `#include "builtin.h"` in your `psuh.c`.
+
+Go ahead and add some throwaway printf to that function. This is a decent
+starting point as we can now add build rules and register the command.
+
+NOTE: Your throwaway text, as well as much of the text you will be adding over
+the course of this tutorial, is user-facing. That means it needs to be
+localizable. Take a look at `po/README` under "Marking strings for translation".
+Throughout the tutorial, we will mark strings for translation as necessary; you
+should also do so when writing your user-facing commands in the future.
+
+----
+int cmd_psuh(int argc, const char **argv, const char *prefix)
+{
+ printf(_("Pony saying hello goes here.\n"));
+ return 0;
+}
+----
+
+Let's try to build it. Open `Makefile`, find where `builtin/push.o` is added
+to `BUILTIN_OBJS`, and add `builtin/psuh.o` in the same way next to it in
+alphabetical order. Once you've done so, move to the top-level directory and
+build simply with `make`. Also add the `DEVELOPER=1` variable to turn on
+some additional warnings:
+
+----
+$ echo DEVELOPER=1 >config.mak
+$ make
+----
+
+NOTE: When you are developing the Git project, it's preferred that you use the
+`DEVELOPER` flag; if there's some reason it doesn't work for you, you can turn
+it off, but it's a good idea to mention the problem to the mailing list.
+
+NOTE: The Git build is parallelizable. `-j#` is not included above but you can
+use it as you prefer, here and elsewhere.
+
+Great, now your new command builds happily on its own. But nobody invokes it.
+Let's change that.
+
+The list of commands lives in `git.c`. We can register a new command by adding
+a `cmd_struct` to the `commands[]` array. `struct cmd_struct` takes a string
+with the command name, a function pointer to the command implementation, and a
+setup option flag. For now, let's keep mimicking `push`. Find the line where
+`cmd_push` is registered, copy it, and modify it for `cmd_psuh`, placing the new
+line in alphabetical order.
+
+The options are documented in `builtin.h` under "Adding a new built-in." Since
+we hope to print some data about the user's current workspace context later,
+we need a Git directory, so choose `RUN_SETUP` as your only option.
+
+Go ahead and build again. You should see a clean build, so let's kick the tires
+and see if it works. There's a binary you can use to test with in the
+`bin-wrappers` directory.
+
+----
+$ ./bin-wrappers/git psuh
+----
+
+Check it out! You've got a command! Nice work! Let's commit this.
+
+`git status` reveals modified `Makefile`, `builtin.h`, and `git.c` as well as
+untracked `builtin/psuh.c` and `git-psuh`. First, let's take care of the binary,
+which should be ignored. Open `.gitignore` in your editor, find `/git-push`, and
+add an entry for your new command in alphabetical order:
+
+----
+...
+/git-prune-packed
+/git-psuh
+/git-pull
+/git-push
+/git-quiltimport
+/git-range-diff
+...
+----
+
+Checking `git status` again should show that `git-psuh` has been removed from
+the untracked list and `.gitignore` has been added to the modified list. Now we
+can stage and commit:
+
+----
+$ git add Makefile builtin.h builtin/psuh.c git.c .gitignore
+$ git commit -s
+----
+
+You will be presented with your editor in order to write a commit message. Start
+the commit with a 50-column or less subject line, including the name of the
+component you're working on, followed by a blank line (always required) and then
+the body of your commit message, which should provide the bulk of the context.
+Remember to be explicit and provide the "Why" of your change, especially if it
+couldn't easily be understood from your diff. When editing your commit message,
+don't remove the Signed-off-by line which was added by `-s` above.
+
+----
+psuh: add a built-in by popular demand
+
+Internal metrics indicate this is a command many users expect to be
+present. So here's an implementation to help drive customer
+satisfaction and engagement: a pony which doubtfully greets the user,
+or, a Pony Saying "Um, Hello" (PSUH).
+
+This commit message is intentionally formatted to 72 columns per line,
+starts with a single line as "commit message subject" that is written as
+if to command the codebase to do something (add this, teach a command
+that). The body of the message is designed to add information about the
+commit that is not readily deduced from reading the associated diff,
+such as answering the question "why?".
+
+Signed-off-by: A U Thor <author@example.com>
+----
+
+Go ahead and inspect your new commit with `git show`. "psuh:" indicates you
+have modified mainly the `psuh` command. The subject line gives readers an idea
+of what you've changed. The sign-off line (`-s`) indicates that you agree to
+the Developer's Certificate of Origin 1.1 (see the
+`Documentation/SubmittingPatches` +++[[dco]]+++ header).
+
+For the remainder of the tutorial, the subject line only will be listed for the
+sake of brevity. However, fully-fleshed example commit messages are available
+on the reference implementation linked at the top of this document.
+
+[[implementation]]
+=== Implementation
+
+It's probably useful to do at least something besides printing out a string.
+Let's start by having a look at everything we get.
+
+Modify your `cmd_psuh` implementation to dump the args you're passed, keeping
+existing `printf()` calls in place:
+
+----
+ int i;
+
+ ...
+
+ printf(Q_("Your args (there is %d):\n",
+ "Your args (there are %d):\n",
+ argc),
+ argc);
+ for (i = 0; i < argc; i++)
+ printf("%d: %s\n", i, argv[i]);
+
+ printf(_("Your current working directory:\n<top-level>%s%s\n"),
+ prefix ? "/" : "", prefix ? prefix : "");
+
+----
+
+Build and try it. As you may expect, there's pretty much just whatever we give
+on the command line, including the name of our command. (If `prefix` is empty
+for you, try `cd Documentation/ && ../bin-wrappers/git psuh`). That's not so
+helpful. So what other context can we get?
+
+Add a line to `#include "config.h"`. Then, add the following bits to the
+function body:
+
+----
+ const char *cfg_name;
+
+...
+
+ git_config(git_default_config, NULL);
+ if (git_config_get_string_const("user.name", &cfg_name) > 0)
+ printf(_("No name is found in config\n"));
+ else
+ printf(_("Your name: %s\n"), cfg_name);
+----
+
+`git_config()` will grab the configuration from config files known to Git and
+apply standard precedence rules. `git_config_get_string_const()` will look up
+a specific key ("user.name") and give you the value. There are a number of
+single-key lookup functions like this one; you can see them all (and more info
+about how to use `git_config()`) in `Documentation/technical/api-config.txt`.
+
+You should see that the name printed matches the one you see when you run:
+
+----
+$ git config --get user.name
+----
+
+Great! Now we know how to check for values in the Git config. Let's commit this
+too, so we don't lose our progress.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: show parameters & config opts"
+----
+
+NOTE: Again, the above is for sake of brevity in this tutorial. In a real change
+you should not use `-m` but instead use the editor to write a meaningful
+message.
+
+Still, it'd be nice to know what the user's working context is like. Let's see
+if we can print the name of the user's current branch. We can mimic the
+`git status` implementation; the printer is located in `wt-status.c` and we can
+see that the branch is held in a `struct wt_status`.
+
+`wt_status_print()` gets invoked by `cmd_status()` in `builtin/commit.c`.
+Looking at that implementation we see the status config being populated like so:
+
+----
+status_init_config(&s, git_status_config);
+----
+
+But as we drill down, we can find that `status_init_config()` wraps a call
+to `git_config()`. Let's modify the code we wrote in the previous commit.
+
+Be sure to include the header to allow you to use `struct wt_status`:
+----
+#include "wt-status.h"
+----
+
+Then modify your `cmd_psuh` implementation to declare your `struct wt_status`,
+prepare it, and print its contents:
+
+----
+ struct wt_status status;
+
+...
+
+ wt_status_prepare(the_repository, &status);
+ git_config(git_default_config, &status);
+
+...
+
+ printf(_("Your current branch: %s\n"), status.branch);
+----
+
+Run it again. Check it out - here's the (verbose) name of your current branch!
+
+Let's commit this as well.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: print the current branch"
+----
+
+Now let's see if we can get some info about a specific commit.
+
+Luckily, there are some helpers for us here. `commit.h` has a function called
+`lookup_commit_reference_by_name` to which we can simply provide a hardcoded
+string; `pretty.h` has an extremely handy `pp_commit_easy()` call which doesn't
+require a full format object to be passed.
+
+Add the following includes:
+
+----
+#include "commit.h"
+#include "pretty.h"
+----
+
+Then, add the following lines within your implementation of `cmd_psuh()` near
+the declarations and the logic, respectively.
+
+----
+ struct commit *c = NULL;
+ struct strbuf commitline = STRBUF_INIT;
+
+...
+
+ c = lookup_commit_reference_by_name("origin/master");
+
+ if (c != NULL) {
+ pp_commit_easy(CMIT_FMT_ONELINE, c, &commitline);
+ printf(_("Current commit: %s\n"), commitline.buf);
+ }
+----
+
+The `struct strbuf` provides some safety belts to your basic `char*`, one of
+which is a length member to prevent buffer overruns. It needs to be initialized
+nicely with `STRBUF_INIT`. Keep it in mind when you need to pass around `char*`.
+
+`lookup_commit_reference_by_name` resolves the name you pass it, so you can play
+with the value there and see what kind of things you can come up with.
+
+`pp_commit_easy` is a convenience wrapper in `pretty.h` that takes a single
+format enum shorthand, rather than an entire format struct. It then
+pretty-prints the commit according to that shorthand. These are similar to the
+formats available with `--pretty=FOO` in many Git commands.
+
+Build it and run, and if you're using the same name in the example, you should
+see the subject line of the most recent commit in `origin/master` that you know
+about. Neat! Let's commit that as well.
+
+----
+$ git add builtin/psuh.c
+$ git commit -sm "psuh: display the top of origin/master"
+----
+
+[[add-documentation]]
+=== Adding Documentation
+
+Awesome! You've got a fantastic new command that you're ready to share with the
+community. But hang on just a minute - this isn't very user-friendly. Run the
+following:
+
+----
+$ ./bin-wrappers/git help psuh
+----
+
+Your new command is undocumented! Let's fix that.
+
+Take a look at `Documentation/git-*.txt`. These are the manpages for the
+subcommands that Git knows about. You can open these up and take a look to get
+acquainted with the format, but then go ahead and make a new file
+`Documentation/git-psuh.txt`. Like with most of the documentation in the Git
+project, help pages are written with AsciiDoc (see CodingGuidelines, "Writing
+Documentation" section). Use the following template to fill out your own
+manpage:
+
+// Surprisingly difficult to embed AsciiDoc source within AsciiDoc.
+[listing]
+....
+git-psuh(1)
+===========
+
+NAME
+----
+git-psuh - Delight users' typo with a shy horse
+
+
+SYNOPSIS
+--------
+[verse]
+'git-psuh [<arg>...]'
+
+DESCRIPTION
+-----------
+...
+
+OPTIONS[[OPTIONS]]
+------------------
+...
+
+OUTPUT
+------
+...
+
+GIT
+---
+Part of the linkgit:git[1] suite
+....
+
+The most important pieces of this to note are the file header, underlined by =,
+the NAME section, and the SYNOPSIS, which would normally contain the grammar if
+your command took arguments. Try to use well-established manpage headers so your
+documentation is consistent with other Git and UNIX manpages; this makes life
+easier for your user, who can skip to the section they know contains the
+information they need.
+
+Now that you've written your manpage, you'll need to build it explicitly. We
+convert your AsciiDoc to troff which is man-readable like so:
+
+----
+$ make all doc
+$ man Documentation/git-psuh.1
+----
+
+or
+
+----
+$ make -C Documentation/ git-psuh.1
+$ man Documentation/git-psuh.1
+----
+
+NOTE: You may need to install the package `asciidoc` to get this to work.
+
+While this isn't as satisfying as running through `git help`, you can at least
+check that your help page looks right.
+
+You can also check that the documentation coverage is good (that is, the project
+sees that your command has been implemented as well as documented) by running
+`make check-docs` from the top-level.
+
+Go ahead and commit your new documentation change.
+
+[[add-usage]]
+=== Adding Usage Text
+
+Try and run `./bin-wrappers/git psuh -h`. Your command should crash at the end.
+That's because `-h` is a special case which your command should handle by
+printing usage.
+
+Take a look at `Documentation/technical/api-parse-options.txt`. This is a handy
+tool for pulling out options you need to be able to handle, and it takes a
+usage string.
+
+In order to use it, we'll need to prepare a NULL-terminated array of usage
+strings and a `builtin_psuh_options` array.
+
+Add a line to `#include "parse-options.h"`.
+
+At global scope, add your array of usage strings:
+
+----
+static const char * const psuh_usage[] = {
+ N_("git psuh [<arg>...]"),
+ NULL,
+};
+----
+
+Then, within your `cmd_psuh()` implementation, we can declare and populate our
+`option` struct. Ours is pretty boring but you can add more to it if you want to
+explore `parse_options()` in more detail:
+
+----
+ struct option options[] = {
+ OPT_END()
+ };
+----
+
+Finally, before you print your args and prefix, add the call to
+`parse-options()`:
+
+----
+ argc = parse_options(argc, argv, prefix, options, psuh_usage, 0);
+----
+
+This call will modify your `argv` parameter. It will strip the options you
+specified in `options` from `argv` and the locations pointed to from `options`
+entries will be updated. Be sure to replace your `argc` with the result from
+`parse_options()`, or you will be confused if you try to parse `argv` later.
+
+It's worth noting the special argument `--`. As you may be aware, many Unix
+commands use `--` to indicate "end of named parameters" - all parameters after
+the `--` are interpreted merely as positional arguments. (This can be handy if
+you want to pass as a parameter something which would usually be interpreted as
+a flag.) `parse_options()` will terminate parsing when it reaches `--` and give
+you the rest of the options afterwards, untouched.
+
+Build again. Now, when you run with `-h`, you should see your usage printed and
+your command terminated before anything else interesting happens. Great!
+
+Go ahead and commit this one, too.
+
+[[testing]]
+== Testing
+
+It's important to test your code - even for a little toy command like this one.
+Moreover, your patch won't be accepted into the Git tree without tests. Your
+tests should:
+
+* Illustrate the current behavior of the feature
+* Prove the current behavior matches the expected behavior
+* Ensure the externally-visible behavior isn't broken in later changes
+
+So let's write some tests.
+
+Related reading: `t/README`
+
+[[overview-test-structure]]
+=== Overview of Testing Structure
+
+The tests in Git live in `t/` and are named with a 4-digit decimal number using
+the schema shown in the Naming Tests section of `t/README`.
+
+[[write-new-test]]
+=== Writing Your Test
+
+Since this a toy command, let's go ahead and name the test with t9999. However,
+as many of the family/subcmd combinations are full, best practice seems to be
+to find a command close enough to the one you've added and share its naming
+space.
+
+Create a new file `t/t9999-psuh-tutorial.sh`. Begin with the header as so (see
+"Writing Tests" and "Source 'test-lib.sh'" in `t/README`):
+
+----
+#!/bin/sh
+
+test_description='git-psuh test
+
+This test runs git-psuh and makes sure it does not crash.'
+
+. ./test-lib.sh
+----
+
+Tests are framed inside of a `test_expect_success` in order to output TAP
+formatted results. Let's make sure that `git psuh` doesn't exit poorly and does
+mention the right animal somewhere:
+
+----
+test_expect_success 'runs correctly with no args and good output' '
+ git psuh >actual &&
+ test_i18ngrep Pony actual
+'
+----
+
+Indicate that you've run everything you wanted by adding the following at the
+bottom of your script:
+
+----
+test_done
+----
+
+Make sure you mark your test script executable:
+
+----
+$ chmod +x t/t9999-psuh-tutorial.sh
+----
+
+You can get an idea of whether you created your new test script successfully
+by running `make -C t test-lint`, which will check for things like test number
+uniqueness, executable bit, and so on.
+
+[[local-test]]
+=== Running Locally
+
+Let's try and run locally:
+
+----
+$ make
+$ cd t/ && prove t9999-psuh-tutorial.sh
+----
+
+You can run the full test suite and ensure `git-psuh` didn't break anything:
+
+----
+$ cd t/
+$ prove -j$(nproc) --shuffle t[0-9]*.sh
+----
+
+NOTE: You can also do this with `make test` or use any testing harness which can
+speak TAP. `prove` can run concurrently. `shuffle` randomizes the order the
+tests are run in, which makes them resilient against unwanted inter-test
+dependencies. `prove` also makes the output nicer.
+
+Go ahead and commit this change, as well.
+
+[[ready-to-share]]
+== Getting Ready to Share
+
+You may have noticed already that the Git project performs its code reviews via
+emailed patches, which are then applied by the maintainer when they are ready
+and approved by the community. The Git project does not accept patches from
+pull requests, and the patches emailed for review need to be formatted a
+specific way. At this point the tutorial diverges, in order to demonstrate two
+different methods of formatting your patchset and getting it reviewed.
+
+The first method to be covered is GitGitGadget, which is useful for those
+already familiar with GitHub's common pull request workflow. This method
+requires a GitHub account.
+
+The second method to be covered is `git send-email`, which can give slightly
+more fine-grained control over the emails to be sent. This method requires some
+setup which can change depending on your system and will not be covered in this
+tutorial.
+
+Regardless of which method you choose, your engagement with reviewers will be
+the same; the review process will be covered after the sections on GitGitGadget
+and `git send-email`.
+
+[[howto-ggg]]
+== Sending Patches via GitGitGadget
+
+One option for sending patches is to follow a typical pull request workflow and
+send your patches out via GitGitGadget. GitGitGadget is a tool created by
+Johannes Schindelin to make life as a Git contributor easier for those used to
+the GitHub PR workflow. It allows contributors to open pull requests against its
+mirror of the Git project, and does some magic to turn the PR into a set of
+emails and send them out for you. It also runs the Git continuous integration
+suite for you. It's documented at http://gitgitgadget.github.io.
+
+[[create-fork]]
+=== Forking `git/git` on GitHub
+
+Before you can send your patch off to be reviewed using GitGitGadget, you will
+need to fork the Git project and upload your changes. First thing - make sure
+you have a GitHub account.
+
+Head to the https://github.com/git/git[GitHub mirror] and look for the Fork
+button. Place your fork wherever you deem appropriate and create it.
+
+[[upload-to-fork]]
+=== Uploading to Your Own Fork
+
+To upload your branch to your own fork, you'll need to add the new fork as a
+remote. You can use `git remote -v` to show the remotes you have added already.
+From your new fork's page on GitHub, you can press "Clone or download" to get
+the URL; then you need to run the following to add, replacing your own URL and
+remote name for the examples provided:
+
+----
+$ git remote add remotename git@github.com:remotename/git.git
+----
+
+or to use the HTTPS URL:
+
+----
+$ git remote add remotename https://github.com/remotename/git/.git
+----
+
+Run `git remote -v` again and you should see the new remote showing up.
+`git fetch remotename` (with the real name of your remote replaced) in order to
+get ready to push.
+
+Next, double-check that you've been doing all your development in a new branch
+by running `git branch`. If you didn't, now is a good time to move your new
+commits to their own branch.
+
+As mentioned briefly at the beginning of this document, we are basing our work
+on `master`, so go ahead and update as shown below, or using your preferred
+workflow.
+
+----
+$ git checkout master
+$ git pull -r
+$ git rebase master psuh
+----
+
+Finally, you're ready to push your new topic branch! (Due to our branch and
+command name choices, be careful when you type the command below.)
+
+----
+$ git push remotename psuh
+----
+
+Now you should be able to go and check out your newly created branch on GitHub.
+
+[[send-pr-ggg]]
+=== Sending a PR to GitGitGadget
+
+In order to have your code tested and formatted for review, you need to start by
+opening a Pull Request against `gitgitgadget/git`. Head to
+https://github.com/gitgitgadget/git and open a PR either with the "New pull
+request" button or the convenient "Compare & pull request" button that may
+appear with the name of your newly pushed branch.
+
+Review the PR's title and description, as it's used by GitGitGadget as the cover
+letter for your change. When you're happy, submit your pull request.
+
+[[run-ci-ggg]]
+=== Running CI and Getting Ready to Send
+
+If it's your first time using GitGitGadget (which is likely, as you're using
+this tutorial) then someone will need to give you permission to use the tool.
+As mentioned in the GitGitGadget documentation, you just need someone who
+already uses it to comment on your PR with `/allow <username>`. GitGitGadget
+will automatically run your PRs through the CI even without the permission given
+but you will not be able to `/submit` your changes until someone allows you to
+use the tool.
+
+If the CI fails, you can update your changes with `git rebase -i` and push your
+branch again:
+
+----
+$ git push -f remotename psuh
+----
+
+In fact, you should continue to make changes this way up until the point when
+your patch is accepted into `next`.
+
+////
+TODO https://github.com/gitgitgadget/gitgitgadget/issues/83
+It'd be nice to be able to verify that the patch looks good before sending it
+to everyone on Git mailing list.
+[[check-work-ggg]]
+=== Check Your Work
+////
+
+[[send-mail-ggg]]
+=== Sending Your Patches
+
+Now that your CI is passing and someone has granted you permission to use
+GitGitGadget with the `/allow` command, sending out for review is as simple as
+commenting on your PR with `/submit`.
+
+[[responding-ggg]]
+=== Updating With Comments
+
+Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
+reply to review comments you will receive on the mailing list.
+
+Once you have your branch again in the shape you want following all review
+comments, you can submit again:
+
+----
+$ git push -f remotename psuh
+----
+
+Next, go look at your pull request against GitGitGadget; you should see the CI
+has been kicked off again. Now while the CI is running is a good time for you
+to modify your description at the top of the pull request thread; it will be
+used again as the cover letter. You should use this space to describe what
+has changed since your previous version, so that your reviewers have some idea
+of what they're looking at. When the CI is done running, you can comment once
+more with `/submit` - GitGitGadget will automatically add a v2 mark to your
+changes.
+
+[[howto-git-send-email]]
+== Sending Patches with `git send-email`
+
+If you don't want to use GitGitGadget, you can also use Git itself to mail your
+patches. Some benefits of using Git this way include finer grained control of
+subject line (for example, being able to use the tag [RFC PATCH] in the subject)
+and being able to send a ``dry run'' mail to yourself to ensure it all looks
+good before going out to the list.
+
+[[setup-git-send-email]]
+=== Prerequisite: Setting Up `git send-email`
+
+Configuration for `send-email` can vary based on your operating system and email
+provider, and so will not be covered in this tutorial, beyond stating that in
+many distributions of Linux, `git-send-email` is not packaged alongside the
+typical `git` install. You may need to install this additional package; there
+are a number of resources online to help you do so. You will also need to
+determine the right way to configure it to use your SMTP server; again, as this
+configuration can change significantly based on your system and email setup, it
+is out of scope for the context of this tutorial.
+
+[[format-patch]]
+=== Preparing Initial Patchset
+
+Sending emails with Git is a two-part process; before you can prepare the emails
+themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
+
+----
+$ git format-patch --cover-letter -o psuh/ master..psuh
+----
+
+The `--cover-letter` parameter tells `format-patch` to create a cover letter
+template for you. You will need to fill in the template before you're ready
+to send - but for now, the template will be next to your other patches.
+
+The `-o psuh/` parameter tells `format-patch` to place the patch files into a
+directory. This is useful because `git send-email` can take a directory and
+send out all the patches from there.
+
+`master..psuh` tells `format-patch` to generate patches for the difference
+between `master` and `psuh`. It will make one patch file per commit. After you
+run, you can go have a look at each of the patches with your favorite text
+editor and make sure everything looks alright; however, it's not recommended to
+make code fixups via the patch file. It's a better idea to make the change the
+normal way using `git rebase -i` or by adding a new commit than by modifying a
+patch.
+
+NOTE: Optionally, you can also use the `--rfc` flag to prefix your patch subject
+with ``[RFC PATCH]'' instead of ``[PATCH]''. RFC stands for ``request for
+comments'' and indicates that while your code isn't quite ready for submission,
+you'd like to begin the code review process. This can also be used when your
+patch is a proposal, but you aren't sure whether the community wants to solve
+the problem with that approach or not - to conduct a sort of design review. You
+may also see on the list patches marked ``WIP'' - this means they are incomplete
+but want reviewers to look at what they have so far. You can add this flag with
+`--subject-prefix=WIP`.
+
+Check and make sure that your patches and cover letter template exist in the
+directory you specified - you're nearly ready to send out your review!
+
+[[cover-letter]]
+=== Preparing Email
+
+In addition to an email per patch, the Git community also expects your patches
+to come with a cover letter, typically with a subject line [PATCH 0/x] (where
+x is the number of patches you're sending). Since you invoked `format-patch`
+with `--cover-letter`, you've already got a template ready. Open it up in your
+favorite editor.
+
+You should see a number of headers present already. Check that your `From:`
+header is correct. Then modify your `Subject:` to something which succinctly
+covers the purpose of your entire topic branch, for example:
+
+----
+Subject: [PATCH 0/7] adding the 'psuh' command
+----
+
+Make sure you retain the ``[PATCH 0/X]'' part; that's what indicates to the Git
+community that this email is the beginning of a review, and many reviewers
+filter their email for this type of flag.
+
+You'll need to add some extra parameters when you invoke `git send-email` to add
+the cover letter.
+
+Next you'll have to fill out the body of your cover letter. This is an important
+component of change submission as it explains to the community from a high level
+what you're trying to do, and why, in a way that's more apparent than just
+looking at your diff. Be sure to explain anything your diff doesn't make clear
+on its own.
+
+Here's an example body for `psuh`:
+
+----
+Our internal metrics indicate widespread interest in the command
+git-psuh - that is, many users are trying to use it, but finding it is
+unavailable, using some unknown workaround instead.
+
+The following handful of patches add the psuh command and implement some
+handy features on top of it.
+
+This patchset is part of the MyFirstContribution tutorial and should not
+be merged.
+----
+
+The template created by `git format-patch --cover-letter` includes a diffstat.
+This gives reviewers a summary of what they're in for when reviewing your topic.
+The one generated for `psuh` from the sample implementation looks like this:
+
+----
+ Documentation/git-psuh.txt | 40 +++++++++++++++++++++
+ Makefile | 1 +
+ builtin.h | 1 +
+ builtin/psuh.c | 73 ++++++++++++++++++++++++++++++++++++++
+ git.c | 1 +
+ t/t9999-psuh-tutorial.sh | 12 +++++++
+ 6 files changed, 128 insertions(+)
+ create mode 100644 Documentation/git-psuh.txt
+ create mode 100644 builtin/psuh.c
+ create mode 100755 t/t9999-psuh-tutorial.sh
+----
+
+Finally, the letter will include the version of Git used to generate the
+patches. You can leave that string alone.
+
+[[sending-git-send-email]]
+=== Sending Email
+
+At this point you should have a directory `psuh/` which is filled with your
+patches and a cover letter. Time to mail it out! You can send it like this:
+
+----
+$ git send-email --to=target@example.com psuh/*.patch
+----
+
+NOTE: Check `git help send-email` for some other options which you may find
+valuable, such as changing the Reply-to address or adding more CC and BCC lines.
+
+NOTE: When you are sending a real patch, it will go to git@vger.kernel.org - but
+please don't send your patchset from the tutorial to the real mailing list! For
+now, you can send it to yourself, to make sure you understand how it will look.
+
+After you run the command above, you will be presented with an interactive
+prompt for each patch that's about to go out. This gives you one last chance to
+edit or quit sending something (but again, don't edit code this way). Once you
+press `y` or `a` at these prompts your emails will be sent! Congratulations!
+
+Awesome, now the community will drop everything and review your changes. (Just
+kidding - be patient!)
+
+[[v2-git-send-email]]
+=== Sending v2
+
+Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
+handle comments from reviewers. Continue this section when your topic branch is
+shaped the way you want it to look for your patchset v2.
+
+When you're ready with the next iteration of your patch, the process is fairly
+similar.
+
+First, generate your v2 patches again:
+
+----
+$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
+----
+
+This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
+to the `psuh/` directory. You may notice that they are sitting alongside the v1
+patches; that's fine, but be careful when you are ready to send them.
+
+Edit your cover letter again. Now is a good time to mention what's different
+between your last version and now, if it's something significant. You do not
+need the exact same body in your second cover letter; focus on explaining to
+reviewers the changes you've made that may not be as visible.
+
+You will also need to go and find the Message-Id of your previous cover letter.
+You can either note it when you send the first series, from the output of `git
+send-email`, or you can look it up on the
+https://public-inbox.org/git[mailing list]. Find your cover letter in the
+archives, click on it, then click "permalink" or "raw" to reveal the Message-Id
+header. It should match:
+
+----
+Message-Id: <foo.12345.author@example.com>
+----
+
+Your Message-Id is `<foo.12345.author@example.com>`. This example will be used
+below as well; make sure to replace it with the correct Message-Id for your
+**previous cover letter** - that is, if you're sending v2, use the Message-Id
+from v1; if you're sending v3, use the Message-Id from v2.
+
+While you're looking at the email, you should also note who is CC'd, as it's
+common practice in the mailing list to keep all CCs on a thread. You can add
+these CC lines directly to your cover letter with a line like so in the header
+(before the Subject line):
+
+----
+CC: author@example.com, Othe R <other@example.com>
+----
+
+Now send the emails again, paying close attention to which messages you pass in
+to the command:
+
+----
+$ git send-email --to=target@example.com
+ --in-reply-to="<foo.12345.author@example.com>"
+ psuh/v2*
+----
+
+[[single-patch]]
+=== Bonus Chapter: One-Patch Changes
+
+In some cases, your very small change may consist of only one patch. When that
+happens, you only need to send one email. Your commit message should already be
+meaningful and explain at a high level the purpose (what is happening and why)
+of your patch, but if you need to supply even more context, you can do so below
+the `---` in your patch. Take the example below, which was generated with `git
+format-patch` on a single commit, and then edited to add the content between
+the `---` and the diffstat.
+
+----
+From 1345bbb3f7ac74abde040c12e737204689a72723 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 18 Apr 2019 15:11:02 -0700
+Subject: [PATCH] README: change the grammar
+
+I think it looks better this way. This part of the commit message will
+end up in the commit-log.
+
+Signed-off-by: A U Thor <author@example.com>
+---
+Let's have a wild discussion about grammar on the mailing list. This
+part of my email will never end up in the commit log. Here is where I
+can add additional context to the mailing list about my intent, outside
+of the context of the commit log. This section was added after `git
+format-patch` was run, by editing the patch file in a text editor.
+
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 88f126184c..38da593a60 100644
+--- a/README.md
++++ b/README.md
+@@ -3,7 +3,7 @@
+ Git - fast, scalable, distributed revision control system
+ =========================================================
+
+-Git is a fast, scalable, distributed revision control system with an
++Git is a fast, scalable, and distributed revision control system with an
+ unusually rich command set that provides both high-level operations
+ and full access to internals.
+
+--
+2.21.0.392.gf8f6787159e-goog
+----
+
+[[now-what]]
+== My Patch Got Emailed - Now What?
+
+[[reviewing]]
+=== Responding to Reviews
+
+After a few days, you will hopefully receive a reply to your patchset with some
+comments. Woohoo! Now you can get back to work.
+
+It's good manners to reply to each comment, notifying the reviewer that you have
+made the change requested, feel the original is better, or that the comment
+inspired you to do something a new way which is superior to both the original
+and the suggested change. This way reviewers don't need to inspect your v2 to
+figure out whether you implemented their comment or not.
+
+If you are going to push back on a comment, be polite and explain why you feel
+your original is better; be prepared that the reviewer may still disagree with
+you, and the rest of the community may weigh in on one side or the other. As
+with all code reviews, it's important to keep an open mind to doing something a
+different way than you originally planned; other reviewers have a different
+perspective on the project than you do, and may be thinking of a valid side
+effect which had not occurred to you. It is always okay to ask for clarification
+if you aren't sure why a change was suggested, or what the reviewer is asking
+you to do.
+
+Make sure your email client has a plaintext email mode and it is turned on; the
+Git list rejects HTML email. Please also follow the mailing list etiquette
+outlined in the
+https://kernel.googlesource.com/pub/scm/git/git/+/todo/MaintNotes[Maintainer's
+Note], which are similar to etiquette rules in most open source communities
+surrounding bottom-posting and inline replies.
+
+When you're making changes to your code, it is cleanest - that is, the resulting
+commits are easiest to look at - if you use `git rebase -i` (interactive
+rebase). Take a look at this
+https://www.oreilly.com/library/view/git-pocket-guide/9781449327507/ch10.html[overview]
+from O'Reilly. The general idea is to modify each commit which requires changes;
+this way, instead of having a patch A with a mistake, a patch B which was fine
+and required no upstream reviews in v1, and a patch C which fixes patch A for
+v2, you can just ship a v2 with a correct patch A and correct patch B. This is
+changing history, but since it's local history which you haven't shared with
+anyone, that is okay for now! (Later, it may not make sense to do this; take a
+look at the section below this one for some context.)
+
+[[after-approval]]
+=== After Review Approval
+
+The Git project has four integration branches: `pu`, `next`, `master`, and
+`maint`. Your change will be placed into `pu` fairly early on by the maintainer
+while it is still in the review process; from there, when it is ready for wider
+testing, it will be merged into `next`. Plenty of early testers use `next` and
+may report issues. Eventually, changes in `next` will make it to `master`,
+which is typically considered stable. Finally, when a new release is cut,
+`maint` is used to base bugfixes onto. As mentioned at the beginning of this
+document, you can read `Documents/SubmittingPatches` for some more info about
+the use of the various integration branches.
+
+Back to now: your code has been lauded by the upstream reviewers. It is perfect.
+It is ready to be accepted. You don't need to do anything else; the maintainer
+will merge your topic branch to `next` and life is good.
+
+However, if you discover it isn't so perfect after this point, you may need to
+take some special steps depending on where you are in the process.
+
+If the maintainer has announced in the "What's cooking in git.git" email that
+your topic is marked for `next` - that is, that they plan to merge it to `next`
+but have not yet done so - you should send an email asking the maintainer to
+wait a little longer: "I've sent v4 of my series and you marked it for `next`,
+but I need to change this and that - please wait for v5 before you merge it."
+
+If the topic has already been merged to `next`, rather than modifying your
+patches with `git rebase -i`, you should make further changes incrementally -
+that is, with another commit, based on top of the maintainer's topic branch as
+detailed in https://github.com/gitster/git. Your work is still in the same topic
+but is now incremental, rather than a wholesale rewrite of the topic branch.
+
+The topic branches in the maintainer's GitHub are mirrored in GitGitGadget, so
+if you're sending your reviews out that way, you should be sure to open your PR
+against the appropriate GitGitGadget/Git branch.
+
+If you're using `git send-email`, you can use it the same way as before, but you
+should generate your diffs from `<topic>..<mybranch>` and base your work on
+`<topic>` instead of `master`.
--- /dev/null
+Git 2.23 Release Notes
+======================
+
+Updates since v2.22
+-------------------
+
+Backward compatibility note
+
+ * The "--base" option of "format-patch" computed the patch-ids for
+ prerequisite patches in an unstable way, which has been updated to
+ compute in a way that is compatible with "git patch-id --stable".
+
+ * The "git log" command by default behaves as if the --mailmap option
+ was given.
+
+
+UI, Workflows & Features
+
+ * The "git fast-export/import" pair has been taught to handle commits
+ with log messages in encoding other than UTF-8 better.
+
+ * In recent versions of Git, per-worktree refs are exposed in
+ refs/worktrees/<wtname>/ hierarchy, which means that worktree names
+ must be a valid refname component. The code now sanitizes the names
+ given to worktrees, to make sure these refs are well-formed.
+
+ * "git merge" learned "--quit" option that cleans up the in-progress
+ merge while leaving the working tree and the index still in a mess.
+
+ * "git format-patch" learns a configuration to set the default for
+ its --notes=<ref> option.
+
+ * The code to show args with potential typo that cannot be
+ interpreted as a commit-ish has been improved.
+
+ * "git clone --recurse-submodules" learned to set up the submodules
+ to ignore commit object names recorded in the superproject gitlink
+ and instead use the commits that happen to be at the tip of the
+ remote-tracking branches from the get-go, by passing the new
+ "--remote-submodules" option.
+
+ * The pattern "git diff/grep" use to extract funcname and words
+ boundary for Matlab has been extend to cover Octave, which is more
+ or less equivalent.
+
+ * "git help git" was hard to discover (well, at least for some
+ people).
+
+ * The pattern "git diff/grep" use to extract funcname and words
+ boundary for Rust has been added.
+
+ * "git status" can be told a non-standard default value for the
+ "--[no-]ahead-behind" option with a new configuration variable
+ status.aheadBehind.
+
+ * "git fetch" and "git pull" reports when a fetch results in
+ non-fast-forward updates to let the user notice unusual situation.
+ The commands learned "--no-show-forced-updates" option to disable
+ this safety feature.
+
+ * Two new commands "git switch" and "git restore" are introduced to
+ split "checking out a branch to work on advancing its history" and
+ "checking out paths out of the index and/or a tree-ish to work on
+ advancing the current history" out of the single "git checkout"
+ command.
+
+ * "git branch --list" learned to always output the detached HEAD as
+ the first item (when the HEAD is detached, of course), regardless
+ of the locale.
+
+ * The conditional inclusion mechanism learned to base the choice on
+ the branch the HEAD currently is on.
+
+ * "git rev-list --objects" learned the "--no-object-names" option to
+ squelch the path to the object that is used as a grouping hint for
+ pack-objects.
+
+ * A new tag.gpgSign configuration variable turns "git tag -a" into
+ "git tag -s".
+
+ * "git multi-pack-index" learned expire and repack subcommands.
+
+ * "git blame" learned to "ignore" commits in the history, whose
+ effects (as well as their presence) get ignored.
+
+ * "git cherry-pick/revert" learned a new "--skip" action.
+
+ * The tips of refs from the alternate object store can be used as
+ starting point for reachability computation now.
+
+ * Extra blank lines in "git status" output have been reduced.
+
+ * The commits in a repository can be described by multiple
+ commit-graph files now, which allows the commit-graph files to be
+ updated incrementally.
+
+ * "git range-diff" output has been tweaked for easier identification
+ of which part of what file the patch shown is about.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Update supporting parts of "git rebase" to remove code that should
+ no longer be used.
+
+ * Developer support to emulate unsatisfied prerequisites in tests to
+ ensure that the remainder of the tests still succeeds when tests
+ with prerequisites are skipped.
+
+ * "git update-server-info" learned not to rewrite the file with the
+ same contents.
+
+ * The way of specifying the path to find dynamic libraries at runtime
+ has been simplified. The old default to pass -R/path/to/dir has been
+ replaced with the new default to pass -Wl,-rpath,/path/to/dir,
+ which is the more recent GCC uses. Those who need to build with an
+ old GCC can still use "CC_LD_DYNPATH=-R"
+
+ * Prepare use of reachability index in topological walker that works
+ on a range (A..B).
+
+ * A new tutorial targeting specifically aspiring git-core
+ developers has been added.
+
+ * Auto-detect how to tell HP-UX aCC where to use dynamically linked
+ libraries from at runtime.
+
+ * "git mergetool" and its tests now spawn fewer subprocesses.
+
+ * Dev support update to help tracing out tests.
+
+ * Support to build with MSVC has been updated.
+
+ * "git fetch" that grabs from a group of remotes learned to run the
+ auto-gc only once at the very end.
+
+ * A handful of Windows build patches have been upstreamed.
+
+ * The code to read state files used by the sequencer machinery for
+ "git status" has been made more robust against a corrupt or stale
+ state files.
+
+ * "git for-each-ref" with multiple patterns have been optimized.
+
+ * The tree-walk API learned to pass an in-core repository
+ instance throughout more codepaths.
+
+ * When one step in multi step cherry-pick or revert is reset or
+ committed, the command line prompt script failed to notice the
+ current status, which has been improved.
+
+ * Many GIT_TEST_* environment variables control various aspects of
+ how our tests are run, but a few followed "non-empty is true, empty
+ or unset is false" while others followed the usual "there are a few
+ ways to spell true, like yes, on, etc., and also ways to spell
+ false, like no, off, etc." convention.
+
+ * Adjust the dir-iterator API and apply it to the local clone
+ optimization codepath.
+
+ * We have been trying out a few language features outside c89; the
+ coding guidelines document did not talk about them and instead had
+ a blanket ban against them.
+
+ * A test helper has been introduced to optimize preparation of test
+ repositories with many simple commits, and a handful of test
+ scripts have been updated to use it.
+
+
+Fixes since v2.22
+-----------------
+
+ * A relative pathname given to "git init --template=<path> <repo>"
+ ought to be relative to the directory "git init" gets invoked in,
+ but it instead was made relative to the repository, which has been
+ corrected.
+
+ * "git worktree add" used to fail when another worktree connected to
+ the same repository was corrupt, which has been corrected.
+
+ * The ownership rule for the file descriptor to fast-import remote
+ backend was mixed up, leading to an unrelated file descriptor getting
+ closed, which has been fixed.
+
+ * A "merge -c" instruction during "git rebase --rebase-merges" should
+ give the user a chance to edit the log message, even when there is
+ otherwise no need to create a new merge and replace the existing
+ one (i.e. fast-forward instead), but did not. Which has been
+ corrected.
+
+ * Code cleanup and futureproof.
+
+ * More parameter validation.
+
+ * "git update-server-info" used to leave stale packfiles in its
+ output, which has been corrected.
+
+ * The server side support for "git fetch" used to show incorrect
+ value for the HEAD symbolic ref when the namespace feature is in
+ use, which has been corrected.
+
+ * "git am -i --resolved" segfaulted after trying to see a commit as
+ if it were a tree, which has been corrected.
+
+ * "git bundle verify" needs to see if prerequisite objects exist in
+ the receiving repository, but the command did not check if we are
+ in a repository upfront, which has been corrected.
+
+ * "git merge --squash" is designed to update the working tree and the
+ index without creating the commit, and this cannot be countermanded
+ by adding the "--commit" option; the command now refuses to work
+ when both options are given.
+
+ * The data collected by fsmonitor was not properly written back to
+ the on-disk index file, breaking t7519 tests occasionally, which
+ has been corrected.
+
+ * Update to Unicode 12.1 width table.
+
+ * The command line to invoke a "git cat-file" command from inside
+ "git p4" was not properly quoted to protect a caret and running a
+ broken command on Windows, which has been corrected.
+
+ * "git request-pull" learned to warn when the ref we ask them to pull
+ from in the local repository and in the published repository are
+ different.
+
+ * When creating a partial clone, the object filtering criteria is
+ recorded for the origin of the clone, but this incorrectly used a
+ hardcoded name "origin" to name that remote; it has been corrected
+ to honor the "--origin <name>" option.
+
+ * "git fetch" into a lazy clone forgot to fetch base objects that are
+ necessary to complete delta in a thin packfile, which has been
+ corrected.
+
+ * The filter_data used in the list-objects-filter (which manages a
+ lazily sparse clone repository) did not use the dynamic array API
+ correctly---'nr' is supposed to point at one past the last element
+ of the array in use. This has been corrected.
+
+ * The description about slashes in gitignore patterns (used to
+ indicate things like "anchored to this level only" and "only
+ matches directories") has been revamped.
+
+ * The URL decoding code has been updated to avoid going past the end
+ of the string while parsing %-<hex>-<hex> sequence.
+
+ * The list of for-each like macros used by clang-format has been
+ updated.
+
+ * "git branch --list" learned to show branches that are checked out
+ in other worktrees connected to the same repository prefixed with
+ '+', similar to the way the currently checked out branch is shown
+ with '*' in front.
+ (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint).
+
+ * Code restructuring during 2.20 period broke fetching tags via
+ "import" based transports.
+
+ * The commit-graph file is now part of the "files that the runtime
+ may keep open file descriptors on, all of which would need to be
+ closed when done with the object store", and the file descriptor to
+ an existing commit-graph file now is closed before "gc" finalizes a
+ new instance to replace it.
+
+ * "git checkout -p" needs to selectively apply a patch in reverse,
+ which did not work well.
+
+ * Code clean-up to avoid signed integer wraparounds during binary search.
+
+ * "git interpret-trailers" always treated '#' as the comment
+ character, regardless of core.commentChar setting, which has been
+ corrected.
+
+ * "git stash show 23" used to work, but no more after getting
+ rewritten in C; this regression has been corrected.
+
+ * "git rebase --abort" used to leave refs/rewritten/ when concluding
+ "git rebase -r", which has been corrected.
+
+ * An incorrect list of options was cached after command line
+ completion failed (e.g. trying to complete a command that requires
+ a repository outside one), which has been corrected.
+
+ * The code to parse scaled numbers out of configuration files has
+ been made more robust and also easier to follow.
+
+ * The codepath to compute delta islands used to spew progress output
+ without giving the callers any way to squelch it, which has been
+ fixed.
+
+ * Protocol capabilities that go over wire should never be translated,
+ but it was incorrectly marked for translation, which has been
+ corrected. The output of protocol capabilities for debugging has
+ been tweaked a bit.
+
+ * Use "Erase in Line" CSI sequence that is already used in the editor
+ support to clear cruft in the progress output.
+
+ * "git submodule foreach" did not protect command line options passed
+ to the command to be run in each submodule correctly, when the
+ "--recursive" option was in use.
+
+ * The configuration variable rebase.rescheduleFailedExec should be
+ effective only while running an interactive rebase and should not
+ affect anything when running a non-interactive one, which was not
+ the case. This has been corrected.
+
+ * The "git clone" documentation refers to command line options in its
+ description in the short form; they have been replaced with long
+ forms to make them more recognisable.
+
+ * Generation of pack bitmaps are now disabled when .keep files exist,
+ as these are mutually exclusive features.
+ (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint).
+
+ * "git rm" to resolve a conflicted path leaked an internal message
+ "needs merge" before actually removing the path, which was
+ confusing. This has been corrected.
+
+ * "git stash --keep-index" did not work correctly on paths that have
+ been removed, which has been fixed.
+ (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).
+
+ * Window 7 update ;-)
+
+ * A codepath that reads from GPG for signed object verification read
+ past the end of allocated buffer, which has been fixed.
+
+ * "git clean" silently skipped a path when it cannot lstat() it; now
+ it gives a warning.
+
+ * "git push --atomic" that goes over the transport-helper (namely,
+ the smart http transport) failed to prevent refs to be pushed when
+ it can locally tell that one of the ref update will fail without
+ having to consult the other end, which has been corrected.
+
+ * The internal diff machinery can be made to read out of bounds while
+ looking for --function-context line in a corner case, which has been
+ corrected.
+ (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge fbec05c210 cc/test-oidmap later to maint).
+ (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint).
+ (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint).
+ (merge d61e6ce1dd sg/fsck-config-in-doc later to maint).
--- /dev/null
+Git 2.24 Release Notes
+======================
+
+Updates since v2.23
+-------------------
+
+Backward compatibility note
+
+ * (no entry yet so far)
+
+
+UI, Workflows & Features
+
+ * We now have an active interim maintainer for the Git-Gui part of
+ the system. Praise and thank Pratyush Yadav for volunteering.
+
+ * The command line parser learned "--end-of-options" notation; the
+ standard convention for scripters to have hardcoded set of options
+ first on the command line, and force the command to treat end-user
+ input as non-options, has been to use "--" as the delimiter, but
+ that would not work for commands that use "--" as a delimiter
+ between revs and pathspec.
+
+ * A mechanism to affect the default setting for a (related) group of
+ configuration variables is introduced.
+
+ * "git fetch" learned "--set-upstream" option to help those who first
+ clone from their private fork they intend to push to, add the true
+ upstream via "git remote add" and then "git fetch" from it.
+
+ * Device-tree files learned their own userdiff patterns.
+ (merge 3c81760bc6 sb/userdiff-dts later to maint).
+
+ * "git rebase --rebase-merges" learned to drive different merge
+ strategies and pass strategy specific options to them.
+
+ * A new "pre-merge-commit" hook has been introduced.
+
+ * Command line completion updates for "git -c var.name=val" have been
+ added.
+
+ * The lazy clone machinery has been taught that there can be more
+ than one promisor remote and consult them in order when downloading
+ missing objects on demand.
+
+ * The list-objects-filter API (used to create a sparse/lazy clone)
+ learned to take a combined filter specification.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The code to write commit-graph over given commit object names has
+ been made a bit more robust.
+
+ * The first line of verbose output from each test piece now carries
+ the test name and number to help scanning with eyeballs.
+
+ * Further clean-up of the initialization code.
+
+ * xmalloc() used to have a mechanism to ditch memory and address
+ space resources as the last resort upon seeing an allocation
+ failure from the underlying malloc(), which made the code complex
+ and thread-unsafe with dubious benefit, as major memory resource
+ users already do limit their uses with various other mechanisms.
+ It has been simplified away.
+
+ * Unnecessary full-tree diff in "git log -L" machinery has been
+ optimized away.
+
+ * The http transport lacked some optimization the native transports
+ learned to avoid unnecessary ref advertisement, which has been
+ corrected.
+
+
+Fixes since v2.23
+-----------------
+
+ * "git grep --recurse-submodules" that looks at the working tree
+ files looked at the contents in the index in submodules, instead of
+ files in the working tree.
+ (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint).
+
+ * Codepaths to walk tree objects have been audited for integer
+ overflows and hardened.
+ (merge 5aa02f9868 jk/tree-walk-overflow later to maint).
+
+ * "git pack-refs" can lose refs that are created while running, which
+ is getting corrected.
+ (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint).
+
+ * "git checkout" and "git restore" to re-populate the index from a
+ tree-ish (typically HEAD) did not work correctly for a path that
+ was removed and then added again with the intent-to-add bit, when
+ the corresponding working tree file was empty. This has been
+ corrected.
+
+ * Compilation fix.
+ (merge 70597e8386 rs/nedalloc-fixlets later to maint).
+
+ * "git gui" learned to call the clean-up procedure before exiting.
+ (merge 0d88f3d2c5 py/git-gui-do-quit later to maint).
+
+ * We promoted the "indent heuristics" that decides where to split
+ diff hunks from experimental to the default a few years ago, but
+ some stale documentation still marked it as experimental, which has
+ been corrected.
+ (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint).
+
+ * Fix a mismerge that happened in 2.22 timeframe.
+ (merge acb7da05ac en/checkout-mismerge-fix later to maint).
+
+ * "git archive" recorded incorrect length in extended pax header in
+ some corner cases, which has been corrected.
+ (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint).
+
+ * On-demand object fetching in lazy clone incorrectly tried to fetch
+ commits from submodule projects, while still working in the
+ superproject, which has been corrected.
+ (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint).
+
+ * Prepare get_short_oid() codepath to be thread-safe.
+ (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint).
+
+ * "for-each-ref" and friends that show refs did not protect themselves
+ against ancient tags that did not record tagger names when asked to
+ show "%(taggername)", which have been corrected.
+ (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint).
+
+ * The "git am" based backend of "git rebase" ignored the result of
+ updating ".gitattributes" done in one step when replaying
+ subsequent steps.
+ (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).
+
+ * Tell cURL library to use the same malloc() implementation, with the
+ xmalloc() wrapper, as the rest of the system, for consistency.
+ (merge 93b980e58f cb/curl-use-xmalloc later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge d1387d3895 en/fast-import-merge-doc later to maint).
+ (merge 1c24a54ea4 bm/repository-layout-typofix later to maint).
+ (merge 415b770b88 ds/midx-expire-repack later to maint).
+ (merge 19800bdc3f nd/diff-parseopt later to maint).
+ (merge 58166c2e9d tg/t0021-racefix later to maint).
`-C` options given, the <num> argument of the last `-C` will
take effect.
+--ignore-rev <rev>::
+ Ignore changes made by the revision when assigning blame, as if the
+ change never happened. Lines that were changed or added by an ignored
+ commit will be blamed on the previous commit that changed that line or
+ nearby lines. This option may be specified multiple times to ignore
+ more than one revision. If the `blame.markIgnoredLines` config option
+ is set, then lines that were changed by an ignored commit and attributed to
+ another commit will be marked with a `?` in the blame output. If the
+ `blame.markUnblamableLines` config option is set, then those lines touched
+ by an ignored commit that we could not attribute to another revision are
+ marked with a '*'.
+
+--ignore-revs-file <file>::
+ Ignore revisions listed in `file`, which must be in the same format as an
+ `fsck.skipList`. This option may be repeated, and these files will be
+ processed after any files specified with the `blame.ignoreRevsFile` config
+ option. An empty file name, `""`, will clear the list of revs from
+ previously processed files.
+
-h::
Show help message.
This is the same as `gitdir` except that matching is done
case-insensitively (e.g. on case-insensitive file sytems)
+`onbranch`::
+ The data that follows the keyword `onbranch:` is taken to be a
+ pattern with standard globbing wildcards and two additional
+ ones, `**/` and `/**`, that can match multiple path components.
+ If we are in a worktree where the name of the branch that is
+ currently checked out matches the pattern, the include condition
+ is met.
++
+If the pattern ends with `/`, `**` will be automatically added. For
+example, the pattern `foo/` becomes `foo/**`. In other words, it matches
+all branches that begin with `foo/`. This is useful if your branches are
+organized hierarchically and you would like to apply a configuration to
+all the branches in that hierarchy.
+
A few more notes on matching via `gitdir` and `gitdir/i`:
* Symlinks in `$GIT_DIR` are not resolved before matching.
[includeIf "gitdir:/path/to/group/"]
path = foo.inc
+ ; include only if we are in a worktree where foo-branch is
+ ; currently checked out
+ [includeIf "onbranch:foo-branch"]
+ path = foo.inc
+
Values
~~~~~~
include::config/fastimport.txt[]
+include::config/feature.txt[]
+
include::config/fetch.txt[]
include::config/format.txt[]
can tell Git that you do not need help by setting these to 'false':
+
--
+ fetchShowForcedUpdates::
+ Advice shown when linkgit:git-fetch[1] takes a long time
+ to calculate forced updates after ref updates, or to warn
+ that the check is disabled.
pushUpdateRejected::
Set this variable to 'false' if you want to disable
'pushNonFFCurrent',
we can still suggest that the user push to either
refs/heads/* or refs/tags/* based on the type of the
source object.
+ statusAheadBehind::
+ Shown when linkgit:git-status[1] computes the ahead/behind
+ counts for a local ref compared to its remote tracking ref,
+ and that calculation takes longer than expected. Will not
+ appear if `status.aheadBehind` is false or the option
+ `--no-ahead-behind` is given.
statusHints::
Show directions on how to proceed from the current
state in the output of linkgit:git-status[1], in
the template shown when writing commit messages in
linkgit:git-commit[1], and in the help message shown
- by linkgit:git-checkout[1] when switching branch.
+ by linkgit:git-switch[1] or
+ linkgit:git-checkout[1] when switching branch.
statusUoption::
Advise to consider using the `-u` option to linkgit:git-status[1]
when the command takes more than 2 seconds to enumerate untracked
resolveConflict::
Advice shown by various commands when conflicts
prevent the operation from being performed.
+ sequencerInUse::
+ Advice shown when a sequencer command is already in progress.
implicitIdentity::
Advice on how to set your identity configuration when
your information is guessed from the system username and
domain name.
detachedHead::
- Advice shown when you used linkgit:git-checkout[1] to
- move to the detach HEAD state, to instruct how to create
- a local branch after the fact.
+ Advice shown when you used
+ linkgit:git-switch[1] or linkgit:git-checkout[1]
+ to move to the detach HEAD state, to instruct how to
+ create a local branch after the fact.
checkoutAmbiguousRemoteBranchName::
Advice shown when the argument to
- linkgit:git-checkout[1] ambiguously resolves to a
+ linkgit:git-checkout[1] and linkgit:git-switch[1]
+ ambiguously resolves to a
remote tracking branch on more than one remote in
situations where an unambiguous argument would have
otherwise caused a remote-tracking branch to be
blame.showRoot::
Do not treat root commits as boundaries in linkgit:git-blame[1].
This option defaults to false.
+
+blame.ignoreRevsFile::
+ Ignore revisions listed in the file, one unabbreviated object name per
+ line, in linkgit:git-blame[1]. Whitespace and comments beginning with
+ `#` are ignored. This option may be repeated multiple times. Empty
+ file names will reset the list of ignored revisions. This option will
+ be handled before the command line option `--ignore-revs-file`.
+
+blame.markUnblamables::
+ Mark lines that were changed by an ignored revision that we could not
+ attribute to another commit with a '*' in the output of
+ linkgit:git-blame[1].
+
+blame.markIgnoredLines::
+ Mark lines that were changed by an ignored revision that we attributed to
+ another commit with a '?' in the output of linkgit:git-blame[1].
branch.autoSetupMerge::
- Tells 'git branch' and 'git checkout' to set up new branches
+ Tells 'git branch', 'git switch' and 'git checkout' to set up new branches
so that linkgit:git-pull[1] will appropriately merge from the
starting point branch. Note that even if this option is not set,
this behavior can be chosen per-branch using the `--track`
branch. This option defaults to true.
branch.autoSetupRebase::
- When a new branch is created with 'git branch' or 'git checkout'
+ When a new branch is created with 'git branch', 'git switch' or 'git checkout'
that tracks another branch, this variable tells Git to set
up pull to rebase instead of merge (see "branch.<name>.rebase").
When `never`, rebase is never automatically set to true.
checkout.defaultRemote::
- When you run 'git checkout <something>' and only have one
+ When you run 'git checkout <something>'
+ or 'git switch <something>' and only have one
remote, it may implicitly fall back on checking out and
tracking e.g. 'origin/<something>'. This stops working as soon
as you have more than one remote with a '<something>'
disambiguation. The typical use-case is to set this to
`origin`.
+
-Currently this is used by linkgit:git-checkout[1] when 'git checkout
-<something>' will checkout the '<something>' branch on another remote,
+Currently this is used by linkgit:git-switch[1] and
+linkgit:git-checkout[1] when 'git checkout <something>'
+or 'git switch <something>'
+will checkout the '<something>' branch on another remote,
and by linkgit:git-worktree[1] when 'git worktree add' refers to a
remote branch. This setting might be used for other checkout-like
commands or functionality in the future.
-
-checkout.optimizeNewBranch::
- Optimizes the performance of "git checkout -b <new_branch>" when
- using sparse-checkout. When set to true, git will not update the
- repo based on the current sparse-checkout settings. This means it
- will not update the skip-worktree bit in the index nor add/remove
- files in the working directory to reflect the current sparse checkout
- settings nor will it show the local changes.
+
This setting should be set to a comma-separated list of color and date settings,
starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the the line was introduced
+The metadata will be colored given the colors if the line was introduced
before the given timestamp, overwriting older timestamped colors.
+
Instead of an absolute timestamp relative timestamps work as well, e.g.
it will automatically be removed, if set to `false`. Before
setting it to `true`, you should check that mtime is working
properly on your system.
- See linkgit:git-update-index[1]. `keep` by default.
+ See linkgit:git-update-index[1]. `keep` by default, unless
+ `feature.manyFiles` is enabled which sets this setting to
+ `true` by default.
core.checkStat::
When missing or is set to `default`, many fields in the stat
core.commitGraph::
If true, then git will read the commit-graph file (if it exists)
- to parse the graph structure of commits. Defaults to false. See
+ to parse the graph structure of commits. Defaults to true. See
linkgit:git-commit-graph[1] for more information.
core.useReplaceRefs::
diff.ignoreSubmodules::
Sets the default value of --ignore-submodules. Note that this
affects only 'git diff' Porcelain, and not lower level 'diff'
- commands such as 'git diff-files'. 'git checkout' also honors
+ commands such as 'git diff-files'. 'git checkout'
+ and 'git switch' also honor
this setting when reporting uncommitted changes. Setting it to
'all' disables the submodule summary normally shown by 'git commit'
and 'git status' when `status.submoduleSummary` is set unless it is
include::../mergetools-diff.txt[]
diff.indentHeuristic::
- Set this option to `true` to enable experimental heuristics
+ Set this option to `false` to disable the default heuristics
that shift diff hunk boundaries to make patches easier to read.
diff.algorithm::
--- /dev/null
+feature.*::
+ The config settings that start with `feature.` modify the defaults of
+ a group of other config settings. These groups are created by the Git
+ developer community as recommended defaults and are subject to change.
+ In particular, new config options may be added with different defaults.
+
+feature.experimental::
+ Enable config options that are new to Git, and are being considered for
+ future defaults. Config settings included here may be added or removed
+ with each release, including minor version updates. These settings may
+ have unintended interactions since they are so new. Please enable this
+ setting if you are interested in providing feedback on experimental
+ features. The new default values are:
++
+* `pack.useSparse=true` uses a new algorithm when constructing a pack-file
+which can improve `git push` performance in repos with many files.
++
+* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
+skipping more commits at a time, reducing the number of round trips.
+
+feature.manyFiles::
+ Enable config options that optimize for repos with many files in the
+ working directory. With many files, commands such as `git status` and
+ `git checkout` may be slow and these new defaults improve performance:
++
+* `index.version=4` enables path-prefix compression in the index.
++
+* `core.untrackedCache=true` enables the untracked cache. This setting assumes
+that mtime is working on your machine.
effort to converge faster, but may result in a larger-than-necessary
packfile; The default is "default" which instructs Git to use the default algorithm
that never skips commits (unless the server has acknowledged it or one
- of its descendants).
+ of its descendants). If `feature.experimental` is enabled, then this
+ setting defaults to "skipping".
Unknown values will cause 'git fetch' to error out.
+
See also the `--negotiation-tip` option for linkgit:git-fetch[1].
+
+fetch.showForcedUpdates::
+ Set to false to enable `--no-show-forced-updates` in
+ linkgit:git-fetch[1] and linkgit:git-pull[1] commands.
+ Defaults to true.
A boolean that controls whether to generate a cover-letter when
format-patch is invoked, but in addition can be set to "auto", to
generate a cover-letter only when there's more than one patch.
+ Default is false.
format.outputDirectory::
Set a custom directory to store the resulting files instead of the
format.useAutoBase::
A boolean value which lets you enable the `--base=auto` option of
format-patch by default.
+
+format.notes::
+ Provides the default value for the `--notes` option to
+ format-patch. Accepts a boolean value, or a ref which specifies
+ where to get notes. If false, format-patch defaults to
+ `--no-notes`. If true, format-patch defaults to `--notes`. If
+ set to a non-boolean value, format-patch defaults to
+ `--notes=<ref>`, where `ref` is the non-boolean value. Defaults
+ to false.
++
+If one wishes to use the ref `ref/notes/true`, please use that literal
+instead.
++
+This configuration can be specified multiple times in order to allow
+multiple notes refs to be included.
If true, then gc will rewrite the commit-graph file when
linkgit:git-gc[1] is run. When using `git gc --auto`
the commit-graph will be updated if housekeeping is
- required. Default is false. See linkgit:git-commit-graph[1]
+ required. Default is true. See linkgit:git-commit-graph[1]
for details.
gc.logExpiry::
index.version::
Specify the version with which new index files should be
initialized. This does not affect existing repositories.
+ If `feature.manyFiles` is enabled, then the default is 4.
In interactive commands, allow the user to provide one-letter
input with a single key (i.e., without hitting enter).
Currently this is used by the `--patch` mode of
- linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
+ linkgit:git-add[1], linkgit:git-checkout[1],
+ linkgit:git-restore[1], linkgit:git-commit[1],
linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
setting is silently ignored if portable keystroke input
is not available; requires the Perl module Term::ReadKey.
log.mailmap::
If true, makes linkgit:git-log[1], linkgit:git-show[1], and
- linkgit:git-whatchanged[1] assume `--use-mailmap`.
+ linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
+ assume `--no-use-mailmap`. True by default.
objects. This can have significant performance benefits when
computing a pack to send a small change. However, it is possible
that extra objects are added to the pack-file if the included
- commits contain certain types of direct renames.
+ commits contain certain types of direct renames. Default is `false`
+ unless `feature.experimental` is enabled.
pack.writeBitmaps (deprecated)::
This is a deprecated synonym for `repack.writeBitmaps`.
+
See also `remote.<name>.prune` and the PRUNING section of
linkgit:git-fetch[1].
+
+remote.<name>.promisor::
+ When set to true, this remote will be used to fetch promisor
+ objects.
+
+remote.<name>.partialclonefilter::
+ The filter that will be applied when fetching from this
+ promisor remote.
the built-in rewrite of it in C.
+
The C rewrite is first included with Git version 2.22 (and Git for Windows
-version 2.19). This option serves an an escape hatch to re-enable the
+version 2.19). This option serves as an escape hatch to re-enable the
legacy version in case any bugs are found in the rewrite. This option and
the shell script version of linkgit:git-stash[1] will be removed in some
future release.
Set to true to enable --branch by default in linkgit:git-status[1].
The option --no-branch takes precedence over this variable.
+status.aheadBehind::
+ Set to true to enable `--ahead-behind` and false to enable
+ `--no-ahead-behind` by default in linkgit:git-status[1] for
+ non-porcelain status formats. Defaults to true.
+
status.displayCommentPrefix::
If set to true, linkgit:git-status[1] will insert a comment
prefix before each output line (starting with
linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
value of this variable will be used as the default.
+tag.gpgSign::
+ A boolean to specify whether all tags should be GPG signed.
+ Use of this option when running in an automated script can
+ result in a large number of tags being signed. It is therefore
+ convenient to use an agent to avoid typing your gpg passphrase
+ several times. Note that this option doesn't affects tag signing
+ behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
+
tar.umask::
This variable can be used to restrict the permission bits of
tar archive entries. The default is 0002, which turns off the
instead be left unreferenced in the repository.
+
Due to the non-quarantine nature of the `fetch.fsckObjects`
-implementation it can not be relied upon to leave the object store
+implementation it cannot be relied upon to leave the object store
clean like `receive.fsckObjects` can.
+
As objects are unpacked they're written to the object store, so there
Allow several <repository> and <group> arguments to be
specified. No <refspec>s may be specified.
+--[no-]auto-gc::
+ Run `git gc --auto` at the end to perform garbage collection
+ if needed. This is enabled by default.
+
-p::
--prune::
Before fetching, remove any remote-tracking references that no
Disable recursive fetching of submodules (this has the same effect as
using the `--recurse-submodules=no` option).
+--set-upstream::
+ If the remote is fetched successfully, pull and add upstream
+ (tracking) reference, used by argument-less
+ linkgit:git-pull[1] and other commands. For more information,
+ see `branch.<name>.merge` and `branch.<name>.remote` in
+ linkgit:git-config[1].
+
--submodule-prefix=<path>::
Prepend <path> to paths printed in informative messages
such as "Fetching submodule foo". This option is used
When multiple `--server-option=<option>` are given, they are all
sent to the other side in the order listed on the command line.
+--show-forced-updates::
+ By default, git checks if a branch is force-updated during
+ fetch. This can be disabled through fetch.showForcedUpdates, but
+ the --show-forced-updates option guarantees this check occurs.
+ See linkgit:git-config[1].
+
+--no-show-forced-updates::
+ By default, git checks if a branch is force-updated during
+ fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates
+ to false to skip this check for performance reasons. If used during
+ 'git-pull' the --ff-only option will still check for forced updates
+ before attempting a fast-forward update. See linkgit:git-config[1].
+
-4::
--ipv4::
Use IPv4 addresses only, ignoring IPv6 addresses.
[verse]
'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
[-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
+ [--ignore-rev <rev>] [--ignore-revs-file <file>]
[--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
[--] <file>
SYNOPSIS
--------
[verse]
-'git branch' [--color[=<when>] | --no-color]
+'git branch' [--color[=<when>] | --no-color] [--show-current]
[-v [--abbrev=<length> | --no-abbrev]]
- [--show-current]
[--column[=<options>] | --no-column] [--sort=<key>]
[(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]]
-----------
If `--list` is given, or if there are no non-option arguments, existing
-branches are listed; the current branch will be highlighted with an
-asterisk. Option `-r` causes the remote-tracking branches to be listed,
+branches are listed; the current branch will be highlighted in green and
+marked with an asterisk. Any branches checked out in linked worktrees will
+be highlighted in cyan and marked with a plus sign. Option `-r` causes the
+remote-tracking branches to be listed,
and option `-a` shows both local and remote branches.
If a `<pattern>`
`HEAD`.
Note that this will create the new branch, but it will not switch the
-working tree to it; use "git checkout <newbranch>" to switch to the
+working tree to it; use "git switch <newbranch>" to switch to the
new branch.
When a local branch is started off a remote-tracking branch, Git sets up the
When in list mode,
show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
- the name of the upstream branch, as well (see also `git remote
- show <remote>`).
+ the path of the linked worktree (if any) and the name of the upstream
+ branch, as well (see also `git remote show <remote>`). Note that the
+ current worktree's HEAD will not have its path printed (it will always
+ be your current directory).
-q::
--quiet::
+
This behavior is the default when the start point is a remote-tracking branch.
Set the branch.autoSetupMerge configuration variable to `false` if you
-want `git checkout` and `git branch` to always behave as if `--no-track`
+want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
were given. Set it to `always` if you want this behavior when the
start-point is either a local or remote-tracking branch.
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git branch my2.6.14 v2.6.14 <1>
-$ git checkout my2.6.14
+$ git switch my2.6.14
------------
+
<1> This step and the next one could be combined into a single step with
NOTES
-----
-If you are creating a branch that you want to checkout immediately, it is
-easier to use the git checkout command with its `-b` option to create
-a branch and check it out with a single command.
+If you are creating a branch that you want to switch to immediately,
+it is easier to use the "git switch" command with its `-c` option to
+do the same thing with a single command.
The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
serve four related but different purposes:
When run with `--branch` option in a repository, the input is first
expanded for the ``previous checkout syntax''
`@{-n}`. For example, `@{-1}` is a way to refer the last thing that
-was checked out using "git checkout" operation. This option should be
+was checked out using "git switch" or "git checkout" operation.
+This option should be
used by porcelains to accept this syntax anywhere a branch name is
expected, so they can act as if you typed the branch name. As an
exception note that, the ``previous checkout operation'' might result
also update `HEAD` to set the specified branch as the current
branch.
-'git checkout' <branch>::
- To prepare for working on <branch>, switch to it by updating
+'git checkout' [<branch>]::
+ To prepare for working on `<branch>`, switch to it by updating
the index and the files in the working tree, and by pointing
- HEAD at the branch. Local modifications to the files in the
+ `HEAD` at the branch. Local modifications to the files in the
working tree are kept, so that they can be committed to the
- <branch>.
+ `<branch>`.
+
-If <branch> is not found but there does exist a tracking branch in
-exactly one remote (call it <remote>) with a matching name, treat as
-equivalent to
+If `<branch>` is not found but there does exist a tracking branch in
+exactly one remote (call it `<remote>`) with a matching name and
+`--no-guess` is not specified, treat as equivalent to
+
------------
$ git checkout -b <branch> --track <remote>/<branch>
------------
+
-If the branch exists in multiple remotes and one of them is named by
-the `checkout.defaultRemote` configuration variable, we'll use that
-one for the purposes of disambiguation, even if the `<branch>` isn't
-unique across all remotes. Set it to
-e.g. `checkout.defaultRemote=origin` to always checkout remote
-branches from there if `<branch>` is ambiguous but exists on the
-'origin' remote. See also `checkout.defaultRemote` in
-linkgit:git-config[1].
-+
-You could omit <branch>, in which case the command degenerates to
+You could omit `<branch>`, in which case the command degenerates to
"check out the current branch", which is a glorified no-op with
rather expensive side-effects to show only the tracking information,
if exists, for the current branch.
`--track` without `-b` implies branch creation; see the
description of `--track` below.
+
-If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it
+If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
is reset. This is the transactional equivalent of
+
------------
'git checkout' --detach [<branch>]::
'git checkout' [--detach] <commit>::
- Prepare to work on top of <commit>, by detaching HEAD at it
+ Prepare to work on top of `<commit>`, by detaching `HEAD` at it
(see "DETACHED HEAD" section), and updating the index and the
files in the working tree. Local modifications to the files
in the working tree are kept, so that the resulting working
tree will be the state recorded in the commit plus the local
modifications.
+
-When the <commit> argument is a branch name, the `--detach` option can
-be used to detach HEAD at the tip of the branch (`git checkout
-<branch>` would check out that branch without detaching HEAD).
+When the `<commit>` argument is a branch name, the `--detach` option can
+be used to detach `HEAD` at the tip of the branch (`git checkout
+<branch>` would check out that branch without detaching `HEAD`).
+
-Omitting <branch> detaches HEAD at the tip of the current branch.
+Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
'git checkout' [<tree-ish>] [--] <pathspec>...::
Overwrite paths in the working tree by replacing with the
- contents in the index or in the <tree-ish> (most often a
- commit). When a <tree-ish> is given, the paths that
- match the <pathspec> are updated both in the index and in
+ contents in the index or in the `<tree-ish>` (most often a
+ commit). When a `<tree-ish>` is given, the paths that
+ match the `<pathspec>` are updated both in the index and in
the working tree.
+
The index may contain unmerged entries because of a previous failed merge.
--quiet::
Quiet, suppress feedback messages.
---[no-]progress::
+--progress::
+--no-progress::
Progress status is reported on the standard error stream
by default when it is attached to a terminal, unless `--quiet`
is specified. This flag enables progress reporting even if not
-f::
--force::
When switching branches, proceed even if the index or the
- working tree differs from HEAD. This is used to throw away
+ working tree differs from `HEAD`. This is used to throw away
local changes.
+
When checking out paths from the index, do not fail upon unmerged
of it").
-b <new_branch>::
- Create a new branch named <new_branch> and start it at
- <start_point>; see linkgit:git-branch[1] for details.
+ Create a new branch named `<new_branch>` and start it at
+ `<start_point>`; see linkgit:git-branch[1] for details.
-B <new_branch>::
- Creates the branch <new_branch> and start it at <start_point>;
- if it already exists, then reset it to <start_point>. This is
+ Creates the branch `<new_branch>` and start it at `<start_point>`;
+ if it already exists, then reset it to `<start_point>`. This is
equivalent to running "git branch" with "-f"; see
linkgit:git-branch[1] for details.
derived from the remote-tracking branch, by looking at the local part of
the refspec configured for the corresponding remote, and then stripping
the initial part up to the "*".
-This would tell us to use "hack" as the local branch when branching
-off of "origin/hack" (or "remotes/origin/hack", or even
-"refs/remotes/origin/hack"). If the given name has no slash, or the above
+This would tell us to use `hack` as the local branch when branching
+off of `origin/hack` (or `remotes/origin/hack`, or even
+`refs/remotes/origin/hack`). If the given name has no slash, or the above
guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with `-b` in such a case.
--no-track::
Do not set up "upstream" configuration, even if the
- branch.autoSetupMerge configuration variable is true.
+ `branch.autoSetupMerge` configuration variable is true.
+
+--guess::
+--no-guess::
+ If `<branch>` is not found but there does exist a tracking
+ branch in exactly one remote (call it `<remote>`) with a
+ matching name, treat as equivalent to
++
+------------
+$ git checkout -b <branch> --track <remote>/<branch>
+------------
++
+If the branch exists in multiple remotes and one of them is named by
+the `checkout.defaultRemote` configuration variable, we'll use that
+one for the purposes of disambiguation, even if the `<branch>` isn't
+unique across all remotes. Set it to
+e.g. `checkout.defaultRemote=origin` to always checkout remote
+branches from there if `<branch>` is ambiguous but exists on the
+'origin' remote. See also `checkout.defaultRemote` in
+linkgit:git-config[1].
++
+Use `--no-guess` to disable this.
-l::
Create the new branch's reflog; see linkgit:git-branch[1] for
--detach::
Rather than checking out a branch to work on it, check out a
commit for inspection and discardable experiments.
- This is the default behavior of "git checkout <commit>" when
- <commit> is not a branch name. See the "DETACHED HEAD" section
+ This is the default behavior of `git checkout <commit>` when
+ `<commit>` is not a branch name. See the "DETACHED HEAD" section
below for details.
--orphan <new_branch>::
- Create a new 'orphan' branch, named <new_branch>, started from
- <start_point> and switch to it. The first commit made on this
+ Create a new 'orphan' branch, named `<new_branch>`, started from
+ `<start_point>` and switch to it. The first commit made on this
new branch will have no parents and it will be the root of a new
history totally disconnected from all the other branches and
commits.
+
The index and the working tree are adjusted as if you had previously run
-"git checkout <start_point>". This allows you to start a new history
-that records a set of paths similar to <start_point> by easily running
-"git commit -a" to make the root commit.
+`git checkout <start_point>`. This allows you to start a new history
+that records a set of paths similar to `<start_point>` by easily running
+`git commit -a` to make the root commit.
+
This can be useful when you want to publish the tree from a commit
without exposing its full history. You might want to do this to publish
code.
+
If you want to start a disconnected history that records a set of paths
-that is totally different from the one of <start_point>, then you should
+that is totally different from the one of `<start_point>`, then you should
clear the index and the working tree right after creating the orphan
-branch by running "git rm -rf ." from the top level of the working tree.
+branch by running `git rm -rf .` from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
working tree, by copying them from elsewhere, extracting a tarball, etc.
--ignore-skip-worktree-bits::
In sparse checkout mode, `git checkout -- <paths>` would
- update only entries matched by <paths> and sparse patterns
- in $GIT_DIR/info/sparse-checkout. This option ignores
- the sparse patterns and adds back any files in <paths>.
+ update only entries matched by `<paths>` and sparse patterns
+ in `$GIT_DIR/info/sparse-checkout`. This option ignores
+ the sparse patterns and adds back any files in `<paths>`.
-m::
--merge::
When switching branches with `--merge`, staged changes may be lost.
--conflict=<style>::
- The same as --merge option above, but changes the way the
+ The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
- merge.conflictStyle configuration variable. Possible values are
+ `merge.conflictStyle` configuration variable. Possible values are
"merge" (default) and "diff3" (in addition to what is shown by
"merge" style, shows the original contents).
-p::
--patch::
Interactively select hunks in the difference between the
- <tree-ish> (or the index, if unspecified) and the working
+ `<tree-ish>` (or the index, if unspecified) and the working
tree. The chosen hunks are then applied in reverse to the
- working tree (and if a <tree-ish> was specified, the index).
+ working tree (and if a `<tree-ish>` was specified, the index).
+
This means that you can use `git checkout -p` to selectively discard
edits from your current working tree. See the ``Interactive Mode''
section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
+
Note that this option uses the no overlay mode by default (see also
-`--[no-]overlay`), and currently doesn't support overlay mode.
+`--overlay`), and currently doesn't support overlay mode.
--ignore-other-worktrees::
`git checkout` refuses when the wanted ref is already checked
out anyway. In other words, the ref can be held by more than one
worktree.
---[no-]recurse-submodules::
- Using --recurse-submodules will update the content of all initialized
+--overwrite-ignore::
+--no-overwrite-ignore::
+ Silently overwrite ignored files when switching branches. This
+ is the default behavior. Use `--no-overwrite-ignore` to abort
+ the operation when the new branch contains ignored files.
+
+--recurse-submodules::
+--no-recurse-submodules::
+ Using `--recurse-submodules` will update the content of all initialized
submodules according to the commit recorded in the superproject. If
local modifications in a submodule would be overwritten the checkout
- will fail unless `-f` is used. If nothing (or --no-recurse-submodules)
+ will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`)
is used, the work trees of submodules will not be updated.
- Just like linkgit:git-submodule[1], this will detach the
- submodules HEAD.
-
---no-guess::
- Do not attempt to create a branch if a remote tracking branch
- of the same name exists.
+ Just like linkgit:git-submodule[1], this will detach `HEAD` of the
+ submodule.
---[no-]overlay::
+--overlay::
+--no-overlay::
In the default overlay mode, `git checkout` never
removes files from the index or the working tree. When
specifying `--no-overlay`, files that appear in the index and
- working tree, but not in <tree-ish> are removed, to make them
- match <tree-ish> exactly.
+ working tree, but not in `<tree-ish>` are removed, to make them
+ match `<tree-ish>` exactly.
<branch>::
Branch to checkout; if it refers to a branch (i.e., a name that,
when prepended with "refs/heads/", is a valid ref), then that
branch is checked out. Otherwise, if it refers to a valid
- commit, your HEAD becomes "detached" and you are no longer on
+ commit, your `HEAD` becomes "detached" and you are no longer on
any branch (see below for details).
+
-You can use the `"@{-N}"` syntax to refer to the N-th last
+You can use the `@{-N}` syntax to refer to the N-th last
branch/commit checked out using "git checkout" operation. You may
-also specify `-` which is synonymous to `"@{-1}"`.
+also specify `-` which is synonymous to `@{-1}`.
+
-As a special case, you may use `"A...B"` as a shortcut for the
+As a special case, you may use `A...B` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
<start_point>::
The name of a commit at which to start the new branch; see
- linkgit:git-branch[1] for details. Defaults to HEAD.
+ linkgit:git-branch[1] for details. Defaults to `HEAD`.
+
As a special case, you may use `"A...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
DETACHED HEAD
-------------
-HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each
+`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each
branch refers to a specific commit. Let's look at a repo with three
-commits, one of them tagged, and with branch 'master' checked out:
+commits, one of them tagged, and with branch `master` checked out:
------------
HEAD (refers to branch 'master')
------------
When a commit is created in this state, the branch is updated to refer to
-the new commit. Specifically, 'git commit' creates a new commit 'd', whose
-parent is commit 'c', and then updates branch 'master' to refer to new
-commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers
-to commit 'd':
+the new commit. Specifically, 'git commit' creates a new commit `d`, whose
+parent is commit `c`, and then updates branch `master` to refer to new
+commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers
+to commit `d`:
------------
$ edit; git add; git commit
It is sometimes useful to be able to checkout a commit that is not at
the tip of any named branch, or even to create a new commit that is not
referenced by a named branch. Let's look at what happens when we
-checkout commit 'b' (here we show two ways this may be done):
+checkout commit `b` (here we show two ways this may be done):
------------
$ git checkout v2.0 # or
tag 'v2.0' (refers to commit 'b')
------------
-Notice that regardless of which checkout command we use, HEAD now refers
-directly to commit 'b'. This is known as being in detached HEAD state.
-It means simply that HEAD refers to a specific commit, as opposed to
+Notice that regardless of which checkout command we use, `HEAD` now refers
+directly to commit `b`. This is known as being in detached `HEAD` state.
+It means simply that `HEAD` refers to a specific commit, as opposed to
referring to a named branch. Let's see what happens when we create a commit:
------------
tag 'v2.0' (refers to commit 'b')
------------
-There is now a new commit 'e', but it is referenced only by HEAD. We can
+There is now a new commit `e`, but it is referenced only by `HEAD`. We can
of course add yet another commit in this state:
------------
------------
In fact, we can perform all the normal Git operations. But, let's look
-at what happens when we then checkout master:
+at what happens when we then checkout `master`:
------------
$ git checkout master
------------
It is important to realize that at this point nothing refers to commit
-'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted
+`f`. Eventually commit `f` (and by extension commit `e`) will be deleted
by the routine Git garbage collection process, unless we create a reference
-before that happens. If we have not yet moved away from commit 'f',
+before that happens. If we have not yet moved away from commit `f`,
any of these will create a reference to it:
------------
$ git tag foo <3>
------------
-<1> creates a new branch 'foo', which refers to commit 'f', and then
- updates HEAD to refer to branch 'foo'. In other words, we'll no longer
- be in detached HEAD state after this command.
+<1> creates a new branch `foo`, which refers to commit `f`, and then
+ updates `HEAD` to refer to branch `foo`. In other words, we'll no longer
+ be in detached `HEAD` state after this command.
-<2> similarly creates a new branch 'foo', which refers to commit 'f',
- but leaves HEAD detached.
+<2> similarly creates a new branch `foo`, which refers to commit `f`,
+ but leaves `HEAD` detached.
-<3> creates a new tag 'foo', which refers to commit 'f',
- leaving HEAD detached.
+<3> creates a new tag `foo`, which refers to commit `f`,
+ leaving `HEAD` detached.
-If we have moved away from commit 'f', then we must first recover its object
+If we have moved away from commit `f`, then we must first recover its object
name (typically by using git reflog), and then we can create a reference to
-it. For example, to see the last two commits to which HEAD referred, we
+it. For example, to see the last two commits to which `HEAD` referred, we
can use either of these commands:
------------
ARGUMENT DISAMBIGUATION
-----------------------
-When there is only one argument given and it is not `--` (e.g. "git
-checkout abc"), and when the argument is both a valid `<tree-ish>`
-(e.g. a branch
"abc" exists) and a valid `<pathspec>` (e.g. a file
+When there is only one argument given and it is not `--` (e.g. `git
+checkout abc`), and when the argument is both a valid `<tree-ish>`
+(e.g. a branch
`abc` exists) and a valid `<pathspec>` (e.g. a file
or a directory whose name is "abc" exists), Git would usually ask
you to disambiguate. Because checking out a branch is so common an
-operation, however, "git checkout abc" takes "abc" as a `<tree-ish>`
+operation, however, `git checkout abc` takes "abc" as a `<tree-ish>`
in such a situation. Use `git checkout -- <pathspec>` if you want
to checkout these paths out of the index.
--------
. The following sequence checks out the `master` branch, reverts
- the `Makefile` to two revisions back, deletes hello.c by
+ the `Makefile` to two revisions back, deletes `hello.c` by
mistake, and gets it back from the index.
+
------------
+
<1> switch branch
<2> take a file out of another commit
-<3> restore hello.c from the index
+<3> restore `hello.c` from the index
+
If you want to check out _all_ C source files out of the index,
you can say
$ git checkout mytopic
------------
+
-However, your "wrong" branch and correct "mytopic" branch may
+However, your "wrong" branch and correct `mytopic` branch may
differ in files that you have modified locally, in which case
the above checkout would fail like this:
+
$ git add frotz
------------
+SEE ALSO
+--------
+linkgit:git-switch[1],
+linkgit:git-restore[1]
+
GIT
---
Part of the linkgit:git[1] suite
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
[-S[<keyid>]] <commit>...
-'git cherry-pick' --continue
-'git cherry-pick' --quit
-'git cherry-pick' --abort
+'git cherry-pick' (--continue | --skip | --abort | --quit)
DESCRIPTION
-----------
still use the ignore rules given with `-e` options from the command
line. This allows removing all untracked
files, including build products. This can be used (possibly in
- conjunction with 'git reset') to create a pristine
+ conjunction with 'git restore' or 'git reset') to create a pristine
working directory to test a clean build.
-X::
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
- [--jobs <n>] [--] <repository> [<directory>]
+ [--[no-]remote-submodules] [--jobs <n>] [--] <repository>
+ [<directory>]
DESCRIPTION
-----------
--[no-]shallow-submodules::
All submodules which are cloned will be shallow with a depth of 1.
+--[no-]remote-submodules::
+ All submodules which are cloned will use the status of the submodule’s
+ remote-tracking branch to update the submodule, rather than the
+ superproject’s recorded SHA-1. Equivalent to passing `--remote` to
+ `git submodule update`.
+
--separate-git-dir=<git dir>::
Instead of placing the cloned repository where it is supposed
to be, place the cloned repository at the specified directory,
--------
[verse]
'git commit-graph read' [--object-dir <dir>]
-'git commit-graph verify' [--object-dir <dir>]
+'git commit-graph verify' [--object-dir <dir>] [--shallow]
'git commit-graph write' <options> [--object-dir <dir>]
Use given directory for the location of packfiles and commit-graph
file. This parameter exists to specify the location of an alternate
that only has the objects directory, not a full `.git` directory. The
- commit-graph file is expected to be at `<dir>/info/commit-graph` and
+ commit-graph file is expected to be in the `<dir>/info` directory and
the packfiles are expected to be in `<dir>/pack`.
+
With the `--append` option, include all commits that are present in the
existing commit-graph file.
++
+With the `--split` option, write the commit-graph as a chain of multiple
+commit-graph files stored in `<dir>/info/commit-graphs`. The new commits
+not already in the commit-graph are added in a new "tip" file. This file
+is merged with the existing file if the following merge conditions are
+met:
++
+* If `--size-multiple=<X>` is not specified, let `X` equal 2. If the new
+tip file would have `N` commits and the previous tip has `M` commits and
+`X` times `N` is greater than `M`, instead merge the two files into a
+single file.
++
+* If `--max-commits=<M>` is specified with `M` a positive integer, and the
+new tip file would have more than `M` commits, then instead merge the new
+tip with the previous tip.
++
+Finally, if `--expire-time=<datetime>` is not specified, let `datetime`
+be the current time. After writing the split commit-graph, delete all
+unused commit-graph whose modified times are older than `datetime`.
'read'::
Read the commit-graph file and verify its contents against the object
database. Used to check for corrupted data.
++
+With the `--shallow` option, only check the tip commit-graph file in
+a chain of split commit-graphs.
EXAMPLES
your working tree are temporarily stored to a staging area
called the "index" with 'git add'. A file can be
reverted back, only in the index but not in the working tree,
-to that of the last commit with `git reset HEAD -- <file>`,
+to that of the last commit with `git restore --staged <file>`,
which effectively reverts 'git add' and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
'git-cvsserver' write access to the database file without granting
them write access to the directory, too.
-The database can not be reliably regenerated in a
+The database cannot be reliably regenerated in a
consistent form after the branch it is tracking has changed.
Example: For merged branches, 'git-cvsserver' only tracks
one branch of development, and after a 'git merge' an
and will make master{tilde}4 no longer have master{tilde}5 as
a parent (though both the old master{tilde}4 and new
master{tilde}4 will have all the same files). Use
- --reference-excluded-parents to instead have the the stream
+ --reference-excluded-parents to instead have the stream
refer to commits in the excluded range of history by their
sha1sum. Note that the resulting stream can only be used by a
repository which already contains the necessary parent
for intermediary filters (e.g. for rewriting commit messages
which refer to older commits, or for stripping blobs by id).
+--reencode=(yes|no|abort)::
+ Specify how to handle `encoding` header in commit objects. When
+ asking to 'abort' (which is the default), this program will die
+ when encountering such a commit object. With 'yes', the commit
+ message will be reencoded into UTF-8. With 'no', the original
+ encoding will be preserved.
+
--refspec::
Apply the specified refspec to each ref exported. Multiple of them can
be specified.
original-oid?
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
+ ('encoding' SP <encoding>)?
data
('from' SP <commit-ish> LF)?
- ('merge' SP <commit-ish> LF)?
+ ('merge' SP <commit-ish> LF)*
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
LF?
....
The `LF` after the command is optional (it used to be required). Note
that for reasons of backward compatibility, if the commit ends with a
-`data` command (i.e. it has has no `from`, `merge`, `filemodify`,
+`data` command (i.e. it has no `from`, `merge`, `filemodify`,
`filedelete`, `filecopy`, `filerename`, `filedeleteall` or
`notemodify` commands) then two `LF` commands may appear at the end of
the command instead of just one.
See ``Date Formats'' above for the set of supported formats, and
their syntax.
+`encoding`
+^^^^^^^^^^
+The optional `encoding` command indicates the encoding of the commit
+message. Most commits are UTF-8 and the encoding is omitted, but this
+allows importing commit messages into git without first reencoding them.
+
`from`
^^^^^^
The `from` command is used to specify the commit to initialize
the local repository by fetching from the branches (respectively)
`pu` and `maint` from the remote repository.
+
-The `pu` branch will be updated even if it is does not fast-forward,
+The `pu` branch will be updated even if it does not fast-forward,
because it is prefixed with a plus sign; `tmp` will not be.
* Peek at a remote's branch, without configuring the remote in your local
----
Using --recurse-submodules can only fetch new commits in already checked
out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be
fetched, making it impossible to check out that submodule later without
having to do a fetch again. This is expected to be fixed in a future Git
version.
`:lstrip` and `:rstrip` options in the same way as `refname`
above.
+worktreepath::
+ The absolute path to the worktree in which the ref is checked
+ out, if it is checked out in any linked worktree. Empty string
+ otherwise.
+
In addition to the above, for commit and tag objects, the header
field names (`tree`, `parent`, `object`, `type`, and `tag`) can
be used to specify the value in the header field.
[--signature-file=<file>]
[-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
- [--in-reply-to=Message-Id] [--suffix=.<sfx>]
+ [--in-reply-to=<message id>] [--suffix=.<sfx>]
[--ignore-if-in-upstream]
- [--rfc] [--subject-prefix=Subject-Prefix]
+ [--rfc] [--subject-prefix=<subject prefix>]
[(--reroll-count|-v) <n>]
[--to=<email>] [--cc=<email>]
- [--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+ [--[no-]cover-letter] [--quiet]
+ [--no-notes | --notes[=<ref>]]
[--interdiff=<previous>]
[--range-diff=<previous> [--creation-factor=<percent>]]
[--progress]
itself. If you want `git format-patch` to take care of threading, you
will want to ensure that threading is disabled for `git send-email`.
---in-reply-to=Message-Id::
+--in-reply-to=<message id>::
Make the first mail (or all the mails with `--no-thread`) appear as a
- reply to the given Message-Id, which avoids breaking threads to
+ reply to the given <message id>, which avoids breaking threads to
provide a new patch series.
--ignore-if-in-upstream::
patches being generated, and any patch that matches is
ignored.
---subject-prefix=<Subject-Prefix>::
+--subject-prefix=<subject prefix>::
Instead of the standard '[PATCH]' prefix in the subject
- line, instead use '[<Subject-Prefix>]'. This
+ line, instead use '[<subject prefix>]'. This
allows for useful naming of a patch series, and can be
combined with the `--numbered` option.
for details.
--notes[=<ref>]::
+--no-notes::
Append the notes (see linkgit:git-notes[1]) for the commit
after the three-dash line.
+
keeping them as Git notes allows them to be maintained between versions
of the patch series (but see the discussion of the `notes.rewrite`
configuration options in linkgit:git-notes[1] to use this workflow).
++
+The default is `--no-notes`, unless the `format.notes` configuration is
+set.
--[no-]signature=<signature>::
Add a signature to each message produced. Per RFC 3676 the signature
--base=<commit>::
Record the base tree information to identify the state the
patch series applies to. See the BASE TREE INFORMATION section
- below for details.
+ below for details. If <commit> is "auto", a base commit is
+ automatically chosen.
--root::
Treat the revision argument as a <revision range>, even if it
-------------
You can specify extra mail header lines to be added to each message,
defaults for the subject prefix and file suffix, number patches when
-outputting more than one patch, add "To" or "Cc:" headers, configure
-attachments, and sign off patches with configuration variables.
+outputting more than one patch, add "To:" or "Cc:" headers, configure
+attachments, change the patch output directory, and sign off patches
+with configuration variables.
------------
[format]
cc = <email>
attach [ = mime-boundary-string ]
signOff = true
- coverletter = auto
+ outputDirectory = <directory>
+ coverLetter = auto
------------
* Apply it:
$ git fetch <project> master:test-apply
- $ git checkout test-apply
- $ git reset --hard
+ $ git switch test-apply
+ $ git restore --source=HEAD --staged --worktree :/
$ git am a.patch
If it does not apply correctly, there can be various reasons.
Print out the ref name given on the command line by which each
commit was reached.
---use-mailmap::
+--[no-]use-mailmap::
Use mailmap file to map author and committer names and email
addresses to canonical real names and email addresses. See
linkgit:git-shortlog[1].
Discussion on fork-point mode
-----------------------------
-After working on the `topic` branch created with `git checkout -b
+After working on the `topic` branch created with `git switch -c
topic origin/master`, the history of remote-tracking branch
`origin/master` may have been rewound and rebuilt, leading to a
history of this shape:
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
- [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+ [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]allow-unrelated-histories]
[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
-'git merge' --abort
-'git merge' --continue
+'git merge' (--continue | --abort | --quit)
DESCRIPTION
-----------
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.
+--overwrite-ignore::
+--no-overwrite-ignore::
+ Silently overwrite ignored files from the merge result. This
+ is the default behavior. Use `--no-overwrite-ignore` to abort.
+
--abort::
Abort the current conflict resolution process, and
try to reconstruct the pre-merge state.
'git merge --abort' is equivalent to 'git reset --merge' when
`MERGE_HEAD` is present.
+--quit::
+ Forget about the current merge in progress. Leave the index
+ and the working tree as-is.
+
--continue::
After a 'git merge' stops due to conflicts you can conclude the
merge by running 'git merge --continue' (see "HOW TO RESOLVE
SYNOPSIS
--------
[verse]
-'git multi-pack-index' [--object-dir=<dir>] <verb>
+'git multi-pack-index' [--object-dir=<dir>] <subcommand>
DESCRIPTION
-----------
`<dir>/packs/multi-pack-index` for the current MIDX file, and
`<dir>/packs` for the pack-files to index.
+The following subcommands are available:
+
write::
- When given as the verb, write a new MIDX file to
- `<dir>/packs/multi-pack-index`.
+ Write a new MIDX file.
verify::
- When given as the verb, verify the contents of the MIDX file
- at `<dir>/packs/multi-pack-index`.
+ Verify the contents of the MIDX file.
+
+expire::
+ Delete the pack-files that are tracked by the MIDX file, but
+ have no objects referenced by the MIDX. Rewrite the MIDX file
+ afterward to remove all references to these pack-files.
+
+repack::
+ Create a new pack-file containing objects in small pack-files
+ referenced by the multi-pack-index. If the size given by the
+ `--batch-size=<size>` argument is zero, then create a pack
+ containing all objects referenced by the multi-pack-index. For
+ a non-zero batch size, Select the pack-files by examining packs
+ from oldest-to-newest, computing the "expected size" by counting
+ the number of objects in the pack referenced by the
+ multi-pack-index, then divide by the total number of objects in
+ the pack and multiply by the pack size. We select packs with
+ expected size below the batch size until the set of packs have
+ total expected size at least the batch size. If the total size
+ does not reach the batch size, then do nothing. If a new pack-
+ file is created, rewrite the multi-pack-index to reference the
+ new pack-file. A later run of 'git multi-pack-index expire' will
+ delete the pack-files that were part of this batch.
EXAMPLES
--keep-pack=<pack-name>::
This flag causes an object already in the given pack to be
ignored, even if it would have otherwise been
- packed. `<pack-name>` is the the pack file name without
+ packed. `<pack-name>` is the pack file name without
leading directory (e.g. `pack-123.pack`). The option could be
specified multiple times to keep multiple packs.
----
Using --recurse-submodules can only fetch new commits in already checked
out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be
fetched, making it impossible to check out that submodule later without
having to do a fetch again. This is expected to be fixed in a future Git
version.
+
If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will
try to infer where in `refs/*` on the destination <repository> it
-belongs based on the the type of <src> being pushed and whether <dst>
+belongs based on the type of <src> being pushed and whether <dst>
is ambiguous.
+
--
[<upstream> [<branch>]]
'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
--root [<branch>]
-'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
+'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
DESCRIPTION
-----------
If <branch> is specified, 'git rebase' will perform an automatic
-`git checkout <branch>` before doing anything else. Otherwise
+`git switch <branch>` before doing anything else. Otherwise
it remains on the current branch.
If <upstream> is not specified, the upstream configured in
* --preserve-merges and --interactive
* --preserve-merges and --signoff
* --preserve-merges and --rebase-merges
- * --rebase-merges and --strategy
- * --rebase-merges and --strategy-option
BEHAVIORAL DIFFERENCES
-----------------------
staging/master
staging/staging-linus
staging/staging-next
-$ git checkout -b staging staging/master
+$ git switch -c staging staging/master
...
------------
--keep-pack=<pack-name>::
Exclude the given pack from repacking. This is the equivalent
- of having `.keep` file on the pack. `<pack-name>` is the the
+ of having `.keep` file on the pack. `<pack-name>` is the
pack file name without leading directory (e.g. `pack-123.pack`).
The option could be specified multiple times to keep multiple
packs.
One way to do it is to pull master into the topic branch:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
o---*---o---+ topic
in which case the final commit graph would look like this:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
$ ... work on both topic and master branches
- $ git checkout master
+ $ git switch master
$ git merge topic
o---*---o---+---o---o topic
top of the tip before the test merge:
------------
- $ git checkout topic
+ $ git switch topic
$ git merge master
$ git reset --hard HEAD^ ;# rewind the test merge
$ ... work on both topic and master branches
- $ git checkout master
+ $ git switch master
$ git merge topic
o---*---o-------o---o topic
the current branch.)
+
This means that `git reset <paths>` is the opposite of `git add
-<paths>`.
+<paths>`. This command is equivalent to
+`git restore [--source=<tree-ish>] --staged <paths>...`.
+
After running `git reset <paths>` to update the index entry, you can
-use linkgit:git-checkout[1] to check the contents out of the index to
-the working tree.
-Alternatively, using linkgit:git-checkout[1] and specifying a commit, you
+use linkgit:git-restore[1] to check the contents out of the index to
+the working tree. Alternatively, using linkgit:git-restore[1]
+and specifying a commit with `--source`, you
can copy the contents of a path out of a commit to the index and to the
working tree in one go.
changes, reset is aborted.
--
-If you want to undo a commit other than the latest on a branch,
-linkgit:git-revert[1] is your friend.
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
OPTIONS
Undo a commit, making it a topic branch::
+
------------
-$ git branch topic/wip <1>
-$ git reset --hard HEAD~3 <2>
-$ git checkout topic/wip <3>
+$ git branch topic/wip <1>
+$ git reset --hard HEAD~3 <2>
+$ git switch topic/wip <3>
------------
+
<1> You have made some commits, but realize they were premature
need to get to the other branch for a quick bugfix.
+
------------
-$ git checkout feature ;# you were working in "feature" branch and
-$ work work work ;# got interrupted
+$ git switch feature ;# you were working in "feature" branch and
+$ work work work ;# got interrupted
$ git commit -a -m "snapshot WIP" <1>
-$ git checkout master
+$ git switch master
$ fix fix fix
$ git commit ;# commit with real log
-$ git checkout feature
+$ git switch feature
$ git reset --soft HEAD^ ;# go back to WIP state <2>
$ git reset <3>
------------
+
------------
$ git tag start
-$ git checkout -b branch1
+$ git switch -c branch1
$ edit
$ git commit ... <1>
$ edit
-$ git checkout -b branch2 <2>
+$ git switch -c branch2 <2>
$ git reset --keep start <3>
------------
+
<1> This commits your first edits in `branch1`.
<2> In the ideal world, you could have realized that the earlier
commit did not belong to the new topic when you created and switched
- to `branch2` (i.e. `git checkout -b branch2 start`), but nobody is
+ to `branch2` (i.e. `git switch -c branch2 start`), but nobody is
perfect.
<3> But you can use `reset --keep` to remove the unwanted commit after
you switched to `branch2`.
--- /dev/null
+git-restore(1)
+==============
+
+NAME
+----
+git-restore - Restore working tree files
+
+SYNOPSIS
+--------
+[verse]
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...
+'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]
+
+DESCRIPTION
+-----------
+Restore specified paths in the working tree with some contents from a
+restore source. If a path is tracked but does not exist in the restore
+source, it will be removed to match the source.
+
+The command can also be used to restore the content in the index with
+`--staged`, or restore both the working tree and the index with
+`--staged --worktree`.
+
+By default, the restore sources for working tree and the index are the
+index and `HEAD` respectively. `--source` could be used to specify a
+commit as the restore source.
+
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+OPTIONS
+-------
+-s <tree>::
+--source=<tree>::
+ Restore the working tree files with the content from the given
+ tree. It is common to specify the source tree by naming a
+ commit, branch or tag associated with it.
++
+If not specified, the default restore source for the working tree is
+the index, and the default restore source for the index is
+`HEAD`. When both `--staged` and `--worktree` are specified,
+`--source` must also be specified.
+
+-p::
+--patch::
+ Interactively select hunks in the difference between the
+ restore source and the restore location. See the ``Interactive
+ Mode'' section of linkgit:git-add[1] to learn how to operate
+ the `--patch` mode.
++
+Note that `--patch` can accept no pathspec and will prompt to restore
+all modified paths.
+
+-W::
+--worktree::
+-S::
+--staged::
+ Specify the restore location. If neither option is specified,
+ by default the working tree is restored. Specifying `--staged`
+ will only restore the index. Specifying both restores both.
+
+-q::
+--quiet::
+ Quiet, suppress feedback messages. Implies `--no-progress`.
+
+--progress::
+--no-progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal, unless `--quiet`
+ is specified. This flag enables progress reporting even if not
+ attached to a terminal, regardless of `--quiet`.
+
+--ours::
+--theirs::
+ When restoring files in the working tree from the index, use
+ stage #2 ('ours') or #3 ('theirs') for unmerged paths.
++
+Note that during `git rebase` and `git pull --rebase`, 'ours' and
+'theirs' may appear swapped. See the explanation of the same options
+in linkgit:git-checkout[1] for details.
+
+-m::
+--merge::
+ When restoring files on the working tree from the index,
+ recreate the conflicted merge in the unmerged paths.
+
+--conflict=<style>::
+ The same as `--merge` option above, but changes the way the
+ conflicting hunks are presented, overriding the
+ `merge.conflictStyle` configuration variable. Possible values
+ are "merge" (default) and "diff3" (in addition to what is
+ shown by "merge" style, shows the original contents).
+
+--ignore-unmerged::
+ When restoring files on the working tree from the index, do
+ not abort the operation if there are unmerged entries and
+ neither `--ours`, `--theirs`, `--merge` or `--conflict` is
+ specified. Unmerged paths on the working tree are left alone.
+
+--ignore-skip-worktree-bits::
+ In sparse checkout mode, by default is to only update entries
+ matched by `<pathspec>` and sparse patterns in
+ $GIT_DIR/info/sparse-checkout. This option ignores the sparse
+ patterns and unconditionally restores any files in
+ `<pathspec>`.
+
+--overlay::
+--no-overlay::
+ In overlay mode, the command never removes files when
+ restoring. In no-overlay mode, tracked files that do not
+ appear in the `--source` tree are removed, to make them match
+ `<tree>` exactly. The default is no-overlay mode.
+
+EXAMPLES
+--------
+
+The following sequence switches to the `master` branch, reverts the
+`Makefile` to two revisions back, deletes hello.c by mistake, and gets
+it back from the index.
+
+------------
+$ git switch master
+$ git restore --source master~2 Makefile <1>
+$ rm -f hello.c
+$ git restore hello.c <2>
+------------
+
+<1> take a file out of another commit
+<2> restore hello.c from the index
+
+If you want to restore _all_ C source files to match the version in
+the index, you can say
+
+------------
+$ git restore '*.c'
+------------
+
+Note the quotes around `*.c`. The file `hello.c` will also be
+restored, even though it is no longer in the working tree, because the
+file globbing is used to match entries in the index (not in the
+working tree by the shell).
+
+To restore all files in the current directory
+
+------------
+$ git restore .
+------------
+
+or to restore all working tree files with 'top' pathspec magic (see
+linkgit:gitglossary[7])
+
+------------
+$ git restore :/
+------------
+
+To restore a file in the index to match the version in `HEAD` (this is
+the same as using linkgit:git-reset[1])
+
+------------
+$ git restore --staged hello.c
+------------
+
+or you can restore both the index and the working tree (this the same
+as using linkgit:git-checkout[1])
+
+------------
+$ git restore --source=HEAD --staged --worktree hello.c
+------------
+
+or the short form which is more practical but less readable:
+
+------------
+$ git restore -s@ -SW hello.c
+------------
+
+SEE ALSO
+--------
+linkgit:git-checkout[1],
+linkgit:git-reset[1]
+
+GIT
+---
+Part of the linkgit:git[1] suite
[ --date=<format>]
[ [ --objects | --objects-edge | --objects-edge-aggressive ]
[ --unpacked ]
+ [ --object-names | --no-object-names ]
[ --filter=<filter-spec> [ --filter-print-omitted ] ] ]
[ --missing=<missing-action> ]
[ --pretty | --header ]
--------
[verse]
'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
-'git revert' --continue
-'git revert' --quit
-'git revert' --abort
+'git revert' (--continue | --skip | --abort | --quit)
DESCRIPTION
-----------
throw away all uncommitted changes in your working directory, you
should see linkgit:git-reset[1], particularly the `--hard` option. If
you want to extract specific files as they were in another commit, you
-should see linkgit:git-checkout[1], specifically the `git checkout
-<commit> -- <filename>` syntax. Take care with these alternatives as
+should see linkgit:git-restore[1], specifically the `--source`
+option. Take care with these alternatives as
both will discard uncommitted changes in your working directory.
+See "Reset, restore and revert" in linkgit:git[1] for the differences
+between the three commands.
+
OPTIONS
-------
<commit>...::
Automating
~~~~~~~~~~
+--no-[to|cc|bcc]::
+ Clears any list of "To:", "Cc:", "Bcc:" addresses previously
+ set via config.
+
+--no-identity::
+ Clears the previously read value of `sendemail.identity` set
+ via config, if any.
+
--to-cmd=<command>::
Specify a command to execute once per patch file which
should generate patch file specific "To:" entries.
+
----------------------------------------------------------------
# ... hack hack hack ...
-$ git checkout -b my_wip
+$ git switch -c my_wip
$ git commit -a -m "WIP"
-$ git checkout master
+$ git switch master
$ edit emergency fix
$ git commit -a -m "Fix in a hurry"
-$ git checkout my_wip
+$ git switch my_wip
$ git reset --soft HEAD^
# ... continue hacking ...
----------------------------------------------------------------
linkgit:git-checkout[1],
linkgit:git-commit[1],
linkgit:git-reflog[1],
-linkgit:git-reset[1]
+linkgit:git-reset[1],
+linkgit:git-switch[1]
GIT
---
--- /dev/null
+git-switch(1)
+=============
+
+NAME
+----
+git-switch - Switch branches
+
+SYNOPSIS
+--------
+[verse]
+'git switch' [<options>] [--no-guess] <branch>
+'git switch' [<options>] --detach [<start-point>]
+'git switch' [<options>] (-c|-C) <new-branch> [<start-point>]
+'git switch' [<options>] --orphan <new-branch>
+
+DESCRIPTION
+-----------
+Switch to a specified branch. The working tree and the index are
+updated to match the branch. All new commits will be added to the tip
+of this branch.
+
+Optionally a new branch could be created with either `-c`, `-C`,
+automatically from a remote branch of same name (see `--guess`), or
+detach the working tree from any branch with `--detach`, along with
+switching.
+
+Switching branches does not require a clean index and working tree
+(i.e. no differences compared to `HEAD`). The operation is aborted
+however if the operation leads to loss of local changes, unless told
+otherwise with `--discard-changes` or `--merge`.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+OPTIONS
+-------
+<branch>::
+ Branch to switch to.
+
+<new-branch>::
+ Name for the new branch.
+
+<start-point>::
+ The starting point for the new branch. Specifying a
+ `<start-point>` allows you to create a branch based on some
+ other point in history than where HEAD currently points. (Or,
+ in the case of `--detach`, allows you to inspect and detach
+ from some other point.)
++
+You can use the `@{-N}` syntax to refer to the N-th last
+branch/commit switched to using "git switch" or "git checkout"
+operation. You may also specify `-` which is synonymous to `@{-1}`.
+This is often used to switch quickly between two branches, or to undo
+a branch switch by mistake.
++
+As a special case, you may use `A...B` as a shortcut for the merge
+base of `A` and `B` if there is exactly one merge base. You can leave
+out at most one of `A` and `B`, in which case it defaults to `HEAD`.
+
+-c <new-branch>::
+--create <new-branch>::
+ Create a new branch named `<new-branch>` starting at
+ `<start-point>` before switching to the branch. This is a
+ convenient shortcut for:
++
+------------
+$ git branch <new-branch>
+$ git switch <new-branch>
+------------
+
+-C <new-branch>::
+--force-create <new-branch>::
+ Similar to `--create` except that if `<new-branch>` already
+ exists, it will be reset to `<start-point>`. This is a
+ convenient shortcut for:
++
+------------
+$ git branch -f <new-branch>
+$ git switch <new-branch>
+------------
+
+-d::
+--detach::
+ Switch to a commit for inspection and discardable
+ experiments. See the "DETACHED HEAD" section in
+ linkgit:git-checkout[1] for details.
+
+--guess::
+--no-guess::
+ If `<branch>` is not found but there does exist a tracking
+ branch in exactly one remote (call it `<remote>`) with a
+ matching name, treat as equivalent to
++
+------------
+$ git switch -c <branch> --track <remote>/<branch>
+------------
++
+If the branch exists in multiple remotes and one of them is named by
+the `checkout.defaultRemote` configuration variable, we'll use that
+one for the purposes of disambiguation, even if the `<branch>` isn't
+unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin`
+to always checkout remote branches from there if `<branch>` is
+ambiguous but exists on the 'origin' remote. See also
+`checkout.defaultRemote` in linkgit:git-config[1].
++
+`--guess` is the default behavior. Use `--no-guess` to disable it.
+
+-f::
+--force::
+ An alias for `--discard-changes`.
+
+--discard-changes::
+ Proceed even if the index or the working tree differs from
+ `HEAD`. Both the index and working tree are restored to match
+ the switching target. If `--recurse-submodules` is specified,
+ submodule content is also restored to match the switching
+ target. This is used to throw away local changes.
+
+-m::
+--merge::
+ If you have local modifications to one or more files that are
+ different between the current branch and the branch to which
+ you are switching, the command refuses to switch branches in
+ order to preserve your modifications in context. However,
+ with this option, a three-way merge between the current
+ branch, your working tree contents, and the new branch is
+ done, and you will be on the new branch.
++
+When a merge conflict happens, the index entries for conflicting
+paths are left unmerged, and you need to resolve the conflicts
+and mark the resolved paths with `git add` (or `git rm` if the merge
+should result in deletion of the path).
+
+--conflict=<style>::
+ The same as `--merge` option above, but changes the way the
+ conflicting hunks are presented, overriding the
+ `merge.conflictStyle` configuration variable. Possible values are
+ "merge" (default) and "diff3" (in addition to what is shown by
+ "merge" style, shows the original contents).
+
+-q::
+--quiet::
+ Quiet, suppress feedback messages.
+
+--progress::
+--no-progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal, unless `--quiet`
+ is specified. This flag enables progress reporting even if not
+ attached to a terminal, regardless of `--quiet`.
+
+-t::
+--track::
+ When creating a new branch, set up "upstream" configuration.
+ `-c` is implied. See `--track` in linkgit:git-branch[1] for
+ details.
++
+If no `-c` option is given, the name of the new branch will be derived
+from the remote-tracking branch, by looking at the local part of the
+refspec configured for the corresponding remote, and then stripping
+the initial part up to the "*". This would tell us to use `hack` as
+the local branch when branching off of `origin/hack` (or
+`remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the
+given name has no slash, or the above guessing results in an empty
+name, the guessing is aborted. You can explicitly give a name with
+`-c` in such a case.
+
+--no-track::
+ Do not set up "upstream" configuration, even if the
+ `branch.autoSetupMerge` configuration variable is true.
+
+--orphan <new-branch>::
+ Create a new 'orphan' branch, named `<new-branch>`. All
+ tracked files are removed.
+
+--ignore-other-worktrees::
+ `git switch` refuses when the wanted ref is already
+ checked out by another worktree. This option makes it check
+ the ref out anyway. In other words, the ref can be held by
+ more than one worktree.
+
+--recurse-submodules::
+--no-recurse-submodules::
+ Using `--recurse-submodules` will update the content of all
+ initialized submodules according to the commit recorded in the
+ superproject. If nothing (or `--no-recurse-submodules`) is
+ used, the work trees of submodules will not be updated. Just
+ like linkgit:git-submodule[1], this will detach `HEAD` of the
+ submodules.
+
+EXAMPLES
+--------
+
+The following command switches to the "master" branch:
+
+------------
+$ git switch master
+------------
+
+After working in the wrong branch, switching to the correct branch
+would be done using:
+
+------------
+$ git switch mytopic
+------------
+
+However, your "wrong" branch and correct "mytopic" branch may differ
+in files that you have modified locally, in which case the above
+switch would fail like this:
+
+------------
+$ git switch mytopic
+error: You have local changes to 'frotz'; not switching branches.
+------------
+
+You can give the `-m` flag to the command, which would try a three-way
+merge:
+
+------------
+$ git switch -m mytopic
+Auto-merging frotz
+------------
+
+After this three-way merge, the local modifications are _not_
+registered in your index file, so `git diff` would show you what
+changes you made since the tip of the new branch.
+
+To switch back to the previous branch before we switched to mytopic
+(i.e. "master" branch):
+
+------------
+$ git switch -
+------------
+
+You can grow a new branch from any commit. For example, switch to
+"HEAD~3" and create branch "fixup":
+
+------------
+$ git switch -c fixup HEAD~3
+Switched to a new branch 'fixup'
+------------
+
+If you want to start a new branch from a remote branch of the same
+name:
+
+------------
+$ git switch new-topic
+Branch 'new-topic' set up to track remote branch 'new-topic' from 'origin'
+Switched to a new branch 'new-topic'
+------------
+
+To check out commit `HEAD~3` for temporary inspection or experiment
+without creating a new branch:
+
+------------
+$ git switch --detach HEAD~3
+HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits'
+------------
+
+If it turns out whatever you have done is worth keeping, you can
+always create a new name for it (without switching away):
+
+------------
+$ git switch -c good-surprises
+------------
+
+SEE ALSO
+--------
+linkgit:git-checkout[1],
+linkgit:git-branch[1]
+
+GIT
+---
+Part of the linkgit:git[1] suite
-s::
--sign::
Make a GPG-signed tag, using the default e-mail address's key.
+ The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
+ configuration variable if it exists, or disabled oder otherwise.
+ See linkgit:git-config[1].
+
+--no-sign::
+ Override `tag.gpgSign` configuration variable that is
+ set to force each and every tag to be signed.
-u <keyid>::
--local-user=<keyid>::
SYNOPSIS
--------
[verse]
-'git update-server-info' [--force]
+'git update-server-info'
DESCRIPTION
-----------
what references and packs the server has. This command
generates such auxiliary files.
-
-OPTIONS
--------
-
--f::
---force::
- Update the info files from scratch.
-
-
OUTPUT
------
manual page gives you an overview of the command-line command syntax.
A formatted and hyperlinked copy of the latest Git documentation
-can be viewed at `https://git.github.io/htmldocs/git.html`.
+can be viewed at https://git.github.io/htmldocs/git.html
+or https://git-scm.com/docs.
OPTIONS
include::cmds-foreignscminterface.txt[]
+Reset, restore and revert
+~~~~~~~~~~~~~~~~~~~~~~~~~
+There are three commands with similar names: `git reset`,
+`git restore` and `git revert`.
+
+* linkgit:git-revert[1] is about making a new commit that reverts the
+ changes made by other commits.
+
+* linkgit:git-restore[1] is about restoring files in the working tree
+ from either the index or another commit. This command does not
+ update your branch. The command can also be used to restore files in
+ the index from another commit.
+
+* linkgit:git-reset[1] is about updating your branch, moving the tip
+ in order to add or remove commits from the branch. This operation
+ changes the commit history.
++
+`git reset` can also be used to restore the index, overlapping with
+`git restore`.
+
Low-level commands (plumbing)
-----------------------------
These attributes affect how the contents stored in the
repository are copied to the working tree files when commands
-such as 'git checkout' and 'git merge' run. They also affect how
+such as 'git switch', 'git checkout' and 'git merge' run.
+They also affect how
Git stores the contents you prepare in the working tree in the
repository upon 'git add' and 'git commit'.
- `css` suitable for cascading style sheets.
+- `dts` suitable for devicetree (DTS) files.
+
- `fortran` suitable for source code in the Fortran language.
- `fountain` suitable for Fountain documents.
- `java` suitable for source code in the Java language.
-- `matlab` suitable for source code in the MATLAB language.
+- `matlab` suitable for source code in the MATLAB and Octave languages.
- `objc` suitable for source code in the Objective-C language.
- `ruby` suitable for source code in the Ruby language.
+- `rust` suitable for source code in the Rust language.
+
- `tex` suitable for source code for LaTeX documents.
file called HEAD in your work tree, `git diff HEAD` is ambiguous, and
you have to say either `git diff HEAD --` or `git diff -- HEAD` to
disambiguate.
+
+ * Because `--` disambiguates revisions and paths in some commands, it
+ cannot be used for those commands to separate options and revisions.
+ You can use `--end-of-options` for this (it also works for commands
+ that do not distinguish between revisions in paths, in which case it
+ is simply an alias for `--`).
+
When writing a script that is expected to handle random user-input, it is
a good practice to make it explicit which arguments are which by placing
things:
+
--------------------------------
-$ git checkout -- *.c
-$ git checkout -- \*.c
+$ git restore *.c
+$ git restore \*.c
--------------------------------
+
The former lets your shell expand the fileglob, and you are asking
http://marc.info/?l=git&m=119150393620273 for further
information.
+Some other commands that also work on files in the working tree and/or
+in the index can take `--staged` and/or `--worktree`.
+
+* `--staged` is exactly like `--cached`, which is used to ask a
+ command to only work on the index, not the working tree.
+
+* `--worktree` is the opposite, to ask a command to work on the
+ working tree only, not the index.
+
+* The two options can be specified together to ask a command to work
+ on both the index and the working tree.
+
GIT
---
Part of the linkgit:git[1] suite
saying that you want to check out a new branch:
------------
-$ git checkout -b mybranch
+$ git switch -c mybranch
------------
will create a new branch based at the current `HEAD` position, and switch
In other words, if you have an earlier tag or branch, you'd just do
------------
-$ git checkout -b mybranch earlier-commit
+$ git switch -c mybranch earlier-commit
------------
and it would create the new branch `mybranch` at the earlier commit,
You can always just jump back to your original `master` branch by doing
------------
-$ git checkout master
+$ git switch master
------------
(or any other branch-name, for that matter) and if you forget which
which will simply _create_ the branch, but will not do anything further.
You can then later -- once you decide that you want to actually develop
-on that branch -- switch to that branch with a regular 'git checkout'
+on that branch -- switch to that branch with a regular 'git switch'
with the branchname as the argument.
that branch, and do some work there.
------------------------------------------------
-$ git checkout mybranch
+$ git switch mybranch
$ echo "Work, work, work" >>hello
$ git commit -m "Some work." -i hello
------------------------------------------------
to the master branch, and editing the same file differently there:
------------
-$ git checkout master
+$ git switch master
------------
Here, take a moment to look at the contents of `hello`, and notice how they
'git merge' to get the "upstream changes" back to your branch.
------------
-$ git checkout mybranch
+$ git switch mybranch
$ git merge -m "Merge upstream changes." master
------------
work." commit.
------------
-$ git checkout mybranch
-$ git reset --hard master^2
-$ git checkout master
+$ git switch -C mybranch master^2
+$ git switch master
$ git reset --hard master^
------------
* linkgit:git-log[1] to see what happened.
- * linkgit:git-checkout[1] and linkgit:git-branch[1] to switch
+ * linkgit:git-switch[1] and linkgit:git-branch[1] to switch
branches.
* linkgit:git-add[1] to manage the index file.
* linkgit:git-commit[1] to advance the current branch.
- * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
- pathname parameters) to undo changes.
+ * linkgit:git-restore[1] to undo changes.
* linkgit:git-merge[1] to merge between local branches.
Create a topic branch and develop.::
+
------------
-$ git checkout -b alsa-audio <1>
+$ git switch -c alsa-audio <1>
$ edit/compile/test
-$ git checkout -- curses/ux_audio_oss.c <2>
+$ git restore curses/ux_audio_oss.c <2>
$ git add curses/ux_audio_alsa.c <3>
$ edit/compile/test
$ git diff HEAD <4>
$ edit/compile/test
$ git diff HEAD^ <6>
$ git commit -a --amend <7>
-$ git checkout master <8>
+$ git switch master <8>
$ git merge alsa-audio <9>
$ git log --since='3 days ago' <10>
$ git log v2.43.. curses/ <11>
------------
$ git clone git://git.kernel.org/pub/scm/.../torvalds/linux-2.6 my2.6
$ cd my2.6
-$ git checkout -b mine master <1>
+$ git switch -c mine master <1>
$ edit/compile/test; git commit -a -s <2>
$ git format-patch master <3>
$ git send-email --to="person <email@example.com>" 00*.patch <4>
-$ git checkout master <5>
+$ git switch master <5>
$ git pull <6>
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <7>
$ git ls-remote --heads http://git.kernel.org/.../jgarzik/libata-dev.git <8>
satellite$ git push origin <4>
mothership$ cd frotz
-mothership$ git checkout master
+mothership$ git switch master
mothership$ git merge satellite/master <5>
------------
+
Branch off of a specific tag.::
+
------------
-$ git checkout -b private2.6.14 v2.6.14 <1>
+$ git switch -c private2.6.14 v2.6.14 <1>
$ edit/compile/test; git commit -a
$ git checkout master
$ git cherry-pick v2.6.14..private2.6.14 <2>
& s 2 3 4 5 ./+to-apply
& s 7 8 ./+hold-linus
& q
-$ git checkout -b topic/one master
+$ git switch -c topic/one master
$ git am -3 -i -s ./+to-apply <4>
$ compile/test
-$ git checkout -b hold/linus && git am -3 -i -s ./+hold-linus <5>
-$ git checkout topic/one && git rebase master <6>
-$ git checkout pu && git reset --hard next <7>
+$ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <5>
+$ git switch topic/one && git rebase master <6>
+$ git switch -C pu next <7>
$ git merge topic/one topic/two && git merge hold/linus <8>
-$ git checkout maint
+$ git switch maint
$ git cherry-pick master~4 <9>
$ compile/test
$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
`hooks.allownonascii` config option unset or set to false--prevents
the use of non-ASCII filenames.
+pre-merge-commit
+~~~~~~~~~~~~~~~~
+
+This hook is invoked by linkgit:git-merge[1], and can be bypassed
+with the `--no-verify` option. It takes no parameters, and is
+invoked after the merge has been carried out successfully and before
+obtaining the proposed commit log message to
+make a commit. Exiting with a non-zero status from this script
+causes the `git merge` command to abort before creating a commit.
+
+The default 'pre-merge-commit' hook, when enabled, runs the
+'pre-commit' hook, if the latter is enabled.
+
+This hook is invoked with the environment variable
+`GIT_EDITOR=:` if the command will not bring up an editor
+to modify the commit message.
+
+If the merge cannot be carried out automatically, the conflicts
+need to be resolved and the result committed separately (see
+linkgit:git-merge[1]). At that point, this hook will not be executed,
+but the 'pre-commit' hook will, if it is enabled.
+
prepare-commit-msg
~~~~~~~~~~~~~~~~~~
post-checkout
~~~~~~~~~~~~~
-This hook is invoked when a linkgit:git-checkout[1] is run after having updated the
+This hook is invoked when a linkgit:git-checkout[1] or
+linkgit:git-switch[1] is run after having updated the
worktree. The hook is given three parameters: the ref of the previous HEAD,
the ref of the new HEAD (which may or may not have changed), and a flag
indicating whether the checkout was a branch checkout (changing branches,
flag=1) or a file checkout (retrieving a file from the index, flag=0).
-This hook cannot affect the outcome of `git checkout`.
+This hook cannot affect the outcome of `git switch` or `git checkout`.
It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is
used. The first parameter given to the hook is the null-ref, the second the
For example, the hook can simply run `git read-tree -u -m HEAD "$1"`
in order to emulate `git fetch` that is run in the reverse direction
with `git push`, as the two-tree form of `git read-tree -u -m` is
-essentially the same as `git checkout` that switches branches while
+essentially the same as `git switch` or `git checkout`
+that switches branches while
keeping the local changes in the working tree that do not interfere
with the difference between the branches.
here are often called 'unpacked' (or 'loose') objects.
objects/pack::
- Packs (files that store many object in compressed form,
+ Packs (files that store many objects in compressed form,
along with index files to allow them to be randomly
accessed) are found in this directory.
$ git status
On branch master
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
new file: closing.txt
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
+ (use "git restore <file>..." to discard changes in working directory)
modified: file.txt
On branch master
Changes to be committed:
Your branch is up to date with 'origin/master'.
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
modified: file1
modified: file2
type
------------------------------------------------
-$ git checkout experimental
+$ git switch experimental
------------------------------------------------
to switch to the experimental branch. Now edit a file, commit the
------------------------------------------------
(edit file)
$ git commit -a
-$ git checkout master
+$ git switch master
------------------------------------------------
Check that the change you made is no longer visible, since it was
.Rewind and rebuild next
[caption="Recipe: "]
=====================================
-* `git checkout next`
-* `git reset --hard master`
+* `git switch -C next master`
* `git merge ai/topic_in_next1`
* `git merge ai/topic_in_next2`
* ...
[[def_object]]object::
The unit of storage in Git. It is uniquely identified by the
<<def_SHA1,SHA-1>> of its contents. Consequently, an
- object can not be changed.
+ object cannot be changed.
[[def_object_database]]object database::
Stores a set of "objects", and an individual <<def_object,object>> is
+
With --squash, --commit is not allowed, and will fail.
+--no-verify::
+ This option bypasses the pre-merge and commit-msg hooks.
+ See also linkgit:githooks[5].
+
-s <strategy>::
--strategy=<strategy>::
Use the given merge strategy; can be supplied more than
Pretend as if all objects mentioned by reflogs are listed on the
command line as `<commit>`.
+--alternate-refs::
+ Pretend as if all objects mentioned as ref tips of alternate
+ repositories were listed on the command line. An alternate
+ repository is any repository whose object directory is specified
+ in `objects/info/alternates`. The set of included objects may
+ be modified by `core.alternateRefsCommand`, etc. See
+ linkgit:git-config[1].
+
--single-worktree::
By default, all working trees will be examined by the
following options when there are more than one (see
Only useful with `--objects`; print the object IDs that are not
in packs.
+--object-names::
+ Only useful with `--objects`; print the names of the object IDs
+ that are found. This is the default behavior.
+
+--no-object-names::
+ Only useful with `--objects`; does not print the names of the object
+ IDs that are found. This inverts `--object-names`. This flag allows
+ the output to be more easily parsed by commands such as
+ linkgit:git-cat-file[1].
+
--filter=<filter-spec>::
Only useful with one of the `--objects*`; omits objects (usually
blobs) from the list of printed objects. The '<filter-spec>'
Note that the form '--filter=sparse:path=<path>' that wants to read
from an arbitrary path on the filesystem has been dropped for security
reasons.
++
+Multiple '--filter=' flags can be specified to combine filters. Only
+objects which are accepted by every filter are included.
++
+The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be
+used to combined several filters, but this is harder than just repeating
+the '--filter' flag and is usually not necessary. Filters are joined by
+'{plus}' and individual filters are %-encoded (i.e. URL-encoded).
+Besides the '{plus}' and '%' characters, the following characters are
+reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+'`+
+as well as all characters with ASCII code <= `0x20`, which includes
+space and newline.
++
+Other arbitrary characters can also be encoded. For instance,
+'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are
+equivalent.
--no-filter::
Turn off any previous `--filter=` argument.
------------------------------
$ git config push.default current
$ git config remote.pushdefault myfork
-$ git checkout -b mybranch origin/master
+$ git switch -c mybranch origin/master
$ git rev-parse --symbolic-full-name @{upstream}
refs/remotes/origin/master
`.git/sequencer`. Can be used to continue after resolving
conflicts in a failed cherry-pick or revert.
+--skip::
+ Skip the current commit and continue with the rest of the
+ sequence.
+
--quit::
Forget about the current operation in progress. Can be used
to clear the sequencer state after a failed cherry-pick or
do not do this you will get an error for each ref that it does not point
to a valid object.
-Note: As a side-effect of this you can not safely assume that all
+Note: As a side-effect of this you cannot safely assume that all
objects you lookup are available in superproject. All submodule objects
will be available the same way as the superprojects objects.
=== The Normal Format Target
The normal format target is a tradition printf format and similar
-to GIT_TRACE format. This format is enabled with the `GIT_TR`
+to GIT_TRACE format. This format is enabled with the `GIT_TRACE2`
environment variable or the `trace2.normalTarget` system or global
config setting.
`setup_traverse_info`::
Initialize a `traverse_info` given the pathname of the tree to start
- traversing from. The `base` argument is assumed to be the `path`
- member of the `name_entry` being recursed into unless the tree is a
- top-level tree in which case the empty string ("") is used.
+ traversing from.
Walking
-------
This utilizes the memory structure of a tree entry to avoid the
overhead of using a generic strlen().
+`strbuf_make_traverse_path`::
+
+ Convenience wrapper to `make_traverse_path` into a strbuf.
+
Authors
-------
1-byte number (C) of "chunks"
- 1-byte (reserved for later use)
- Current clients should ignore this value.
+ 1-byte number (B) of base commit-graphs
+ We infer the length (H*B) of the Base Graphs chunk
+ from this value.
CHUNK LOOKUP:
positions for the parents until reaching a value with the most-significant
bit on. The other bits correspond to the position of the last parent.
+ Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional]
+ This list of H-byte hashes describe a set of B commit-graph files that
+ form a commit-graph chain. The graph position for the ith commit in this
+ file's OID Lookup chunk is equal to i plus the number of commits in all
+ base graphs. If B is non-zero, this chunk must exist.
+
TRAILER:
H-byte HASH-checksum of all of the above.
helpful for these clones, anyway. The commit-graph will not be read or
written when shallow commits are present.
+Commit Graphs Chains
+--------------------
+
+Typically, repos grow with near-constant velocity (commits per day). Over time,
+the number of commits added by a fetch operation is much smaller than the
+number of commits in the full history. By creating a "chain" of commit-graphs,
+we enable fast writes of new commit data without rewriting the entire commit
+history -- at least, most of the time.
+
+## File Layout
+
+A commit-graph chain uses multiple files, and we use a fixed naming convention
+to organize these files. Each commit-graph file has a name
+`$OBJDIR/info/commit-graphs/graph-{hash}.graph` where `{hash}` is the hex-
+valued hash stored in the footer of that file (which is a hash of the file's
+contents before that hash). For a chain of commit-graph files, a plain-text
+file at `$OBJDIR/info/commit-graphs/commit-graph-chain` contains the
+hashes for the files in order from "lowest" to "highest".
+
+For example, if the `commit-graph-chain` file contains the lines
+
+```
+ {hash0}
+ {hash1}
+ {hash2}
+```
+
+then the commit-graph chain looks like the following diagram:
+
+ +-----------------------+
+ | graph-{hash2}.graph |
+ +-----------------------+
+ |
+ +-----------------------+
+ | |
+ | graph-{hash1}.graph |
+ | |
+ +-----------------------+
+ |
+ +-----------------------+
+ | |
+ | |
+ | |
+ | graph-{hash0}.graph |
+ | |
+ | |
+ | |
+ +-----------------------+
+
+Let X0 be the number of commits in `graph-{hash0}.graph`, X1 be the number of
+commits in `graph-{hash1}.graph`, and X2 be the number of commits in
+`graph-{hash2}.graph`. If a commit appears in position i in `graph-{hash2}.graph`,
+then we interpret this as being the commit in position (X0 + X1 + i), and that
+will be used as its "graph position". The commits in `graph-{hash2}.graph` use these
+positions to refer to their parents, which may be in `graph-{hash1}.graph` or
+`graph-{hash0}.graph`. We can navigate to an arbitrary commit in position j by checking
+its containment in the intervals [0, X0), [X0, X0 + X1), [X0 + X1, X0 + X1 +
+X2).
+
+Each commit-graph file (except the base, `graph-{hash0}.graph`) contains data
+specifying the hashes of all files in the lower layers. In the above example,
+`graph-{hash1}.graph` contains `{hash0}` while `graph-{hash2}.graph` contains
+`{hash0}` and `{hash1}`.
+
+## Merging commit-graph files
+
+If we only added a new commit-graph file on every write, we would run into a
+linear search problem through many commit-graph files. Instead, we use a merge
+strategy to decide when the stack should collapse some number of levels.
+
+The diagram below shows such a collapse. As a set of new commits are added, it
+is determined by the merge strategy that the files should collapse to
+`graph-{hash1}`. Thus, the new commits, the commits in `graph-{hash2}` and
+the commits in `graph-{hash1}` should be combined into a new `graph-{hash3}`
+file.
+
+ +---------------------+
+ | |
+ | (new commits) |
+ | |
+ +---------------------+
+ | |
+ +-----------------------+ +---------------------+
+ | graph-{hash2} |->| |
+ +-----------------------+ +---------------------+
+ | | |
+ +-----------------------+ +---------------------+
+ | | | |
+ | graph-{hash1} |->| |
+ | | | |
+ +-----------------------+ +---------------------+
+ | tmp_graphXXX
+ +-----------------------+
+ | |
+ | |
+ | |
+ | graph-{hash0} |
+ | |
+ | |
+ | |
+ +-----------------------+
+
+During this process, the commits to write are combined, sorted and we write the
+contents to a temporary file, all while holding a `commit-graph-chain.lock`
+lock-file. When the file is flushed, we rename it to `graph-{hash3}`
+according to the computed `{hash3}`. Finally, we write the new chain data to
+`commit-graph-chain.lock`:
+
+```
+ {hash3}
+ {hash0}
+```
+
+We then close the lock-file.
+
+## Merge Strategy
+
+When writing a set of commits that do not exist in the commit-graph stack of
+height N, we default to creating a new file at level N + 1. We then decide to
+merge with the Nth level if one of two conditions hold:
+
+ 1. `--size-multiple=<X>` is specified or X = 2, and the number of commits in
+ level N is less than X times the number of commits in level N + 1.
+
+ 2. `--max-commits=<C>` is specified with non-zero C and the number of commits
+ in level N + 1 is more than C commits.
+
+This decision cascades down the levels: when we merge a level we create a new
+set of commits that then compares to the next level.
+
+The first condition bounds the number of levels to be logarithmic in the total
+number of commits. The second condition bounds the total number of commits in
+a `graph-{hashN}` file and not in the `commit-graph` file, preventing
+significant performance issues when the stack merges and another process only
+partially reads the previous stack.
+
+The merge strategy values (2 for the size multiple, 64,000 for the maximum
+number of commits) could be extracted into config settings for full
+flexibility.
+
+## Deleting graph-{hash} files
+
+After a new tip file is written, some `graph-{hash}` files may no longer
+be part of a chain. It is important to remove these files from disk, eventually.
+The main reason to delay removal is that another process could read the
+`commit-graph-chain` file before it is rewritten, but then look for the
+`graph-{hash}` files after they are deleted.
+
+To allow holding old split commit-graphs for a while after they are unreferenced,
+we update the modified times of the files when they become unreferenced. Then,
+we scan the `$OBJDIR/info/commit-graphs/` directory for `graph-{hash}`
+files whose modified times are older than a given expiry window. This window
+defaults to zero, but can be changed using command-line arguments or a config
+setting.
+
+## Chains across multiple object directories
+
+In a repo with alternates, we look for the `commit-graph-chain` file starting
+in the local object directory and then in each alternate. The first file that
+exists defines our chain. As we look for the `graph-{hash}` files for
+each `{hash}` in the chain file, we follow the same pattern for the host
+directories.
+
+This allows commit-graphs to be split across multiple forks in a fork network.
+The typical case is a large "base" repo with many smaller forks.
+
+As the base repo advances, it will likely update and merge its commit-graph
+chain more frequently than the forks. If a fork updates their commit-graph after
+the base repo, then it should "reparent" the commit-graph chain onto the new
+chain in the base repo. When reading each `graph-{hash}` file, we track
+the object directory containing it. During a write of a new commit-graph file,
+we check for any changes in the source object directory and read the
+`commit-graph-chain` file for that source and create a new file based on those
+files. During this "reparent" operation, we necessarily need to collapse all
+levels in the fork, as all of the files are invalid against the new base file.
+
+It is crucial to be careful when cleaning up "unreferenced" `graph-{hash}.graph`
+files in this scenario. It falls to the user to define the proper settings for
+their custom environment:
+
+ 1. When merging levels in the base repo, the unreferenced files may still be
+ referenced by chains from fork repos.
+
+ 2. The expiry time should be set to a length of time such that every fork has
+ time to recompute their commit-graph chain to "reparent" onto the new base
+ file(s).
+
+ 3. If the commit-graph chain is updated in the base, the fork will not have
+ access to the new chain until its chain is updated to reference those files.
+ (This may change in the future [5].)
+
Related Links
-------------
[0] https://bugs.chromium.org/p/git/issues/detail?id=8
[4] https://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
A patch to remove the ahead-behind calculation from 'status'.
+
+[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
+ A discussion of a "two-dimensional graph position" that can allow reading
+ multiple commit-graph chains at the same time.
below). To avoid the race when writing new objects referring to an
about-to-be-deleted object, code paths that write new objects will
need to copy any objects from UNREACHABLE_GARBAGE packs that they
-refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
+refer to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
indicated by the file's mtime) is long enough ago.
times and disk usage. Missing objects can later be "demand fetched"
if/when needed.
+A remote that can later provide the missing objects is called a
+promisor remote, as it promises to send the objects when
+requested. Initialy Git supported only one promisor remote, the origin
+remote from which the user cloned and that was configured in the
+"extensions.partialClone" config option. Later support for more than
+one promisor remote has been implemented.
+
Use of partial clone requires that the user be online and the origin
-remote be available for on-demand fetching of missing objects. This may
-or may not be problematic for the user. For example, if the user can
-stay within the pre-selected subset of the source tree, they may not
-encounter any missing objects. Alternatively, the user could try to
-pre-fetch various objects if they know that they are going offline.
+remote or other promisor remotes be available for on-demand fetching
+of missing objects. This may or may not be problematic for the user.
+For example, if the user can stay within the pre-selected subset of
+the source tree, they may not encounter any missing objects.
+Alternatively, the user could try to pre-fetch various objects if they
+know that they are going offline.
Non-Goals
Handling Missing Objects
------------------------
-- An object may be missing due to a partial clone or fetch, or missing due
- to repository corruption. To differentiate these cases, the local
- repository specially indicates such filtered packfiles obtained from the
- promisor remote as "promisor packfiles".
+- An object may be missing due to a partial clone or fetch, or missing
+ due to repository corruption. To differentiate these cases, the
+ local repository specially indicates such filtered packfiles
+ obtained from promisor remotes as "promisor packfiles".
+
These promisor packfiles consist of a "<name>.promisor" file with
arbitrary contents (like the "<name>.keep" files), in addition to
their "<name>.pack" and "<name>.idx" files.
- The local repository considers a "promisor object" to be an object that
- it knows (to the best of its ability) that the promisor remote has promised
- that it has, either because the local repository has that object in one of
+ it knows (to the best of its ability) that promisor remotes have promised
+ that they have, either because the local repository has that object in one of
its promisor packfiles, or because another promisor object refers to it.
+
When Git encounters a missing object, Git can see if it is a promisor object
- Since almost all Git code currently expects any referenced object to be
present locally and because we do not want to force every command to do
a dry-run first, a fallback mechanism is added to allow Git to attempt
- to dynamically fetch missing objects from the promisor remote.
+ to dynamically fetch missing objects from promisor remotes.
+
When the normal object lookup fails to find an object, Git invokes
-fetch-object to try to get the object from the server and then retry
-the object lookup. This allows objects to be "faulted in" without
-complicated prediction algorithms.
+promisor_remote_get_direct() to try to get the object from a promisor
+remote and then retry the object lookup. This allows objects to be
+"faulted in" without complicated prediction algorithms.
+
For efficiency reasons, no check as to whether the missing object is
actually a promisor object is performed.
+
We are not happy with this global variable and would like to remove it,
but that requires significant refactoring of the object code to pass an
-additional flag. We hope that concurrent efforts to add an ODB API can
-encompass this.
+additional flag.
Fetching Missing Objects
though they are not necessary.
+Using many promisor remotes
+---------------------------
+
+Many promisor remotes can be configured and used.
+
+This allows for example a user to have multiple geographically-close
+cache servers for fetching missing blobs while continuing to do
+filtered `git-fetch` commands from the central server.
+
+When fetching objects, promisor remotes are tried one after the other
+until all the objects have been fetched.
+
+Remotes that are considered "promisor" remotes are those specified by
+the following configuration variables:
+
+- `extensions.partialClone = <name>`
+
+- `remote.<name>.promisor = true`
+
+- `remote.<name>.partialCloneFilter = ...`
+
+Only one promisor remote can be configured using the
+`extensions.partialClone` config variable. This promisor remote will
+be the last one tried when fetching objects.
+
+We decided to make it the last one we try, because it is likely that
+someone using many promisor remotes is doing so because the other
+promisor remotes are better for some reason (maybe they are closer or
+faster for some kind of objects) than the origin, and the origin is
+likely to be the remote specified by extensions.partialClone.
+
+This justification is not very strong, but one choice had to be made,
+and anyway the long term plan should be to make the order somehow
+fully configurable.
+
+For now though the other promisor remotes will be tried in the order
+they appear in the config file.
+
Current Limitations
-------------------
-- The remote used for a partial clone (or the first partial fetch
- following a regular clone) is marked as the "promisor remote".
+- It is not possible to specify the order in which the promisor
+ remotes are tried in other ways than the order in which they appear
+ in the config file.
+
-We are currently limited to a single promisor remote and only that
-remote may be used for subsequent partial fetches.
+It is also not possible to specify an order to be used when fetching
+from one remote and a different order when fetching from another
+remote.
+
+- It is not possible to push only specific objects to a promisor
+ remote.
+
-We accept this limitation because we believe initial users of this
-feature will be using it on repositories with a strong single central
-server.
+It is not possible to push at the same time to multiple promisor
+remote in a specific order.
-- Dynamic object fetching will only ask the promisor remote for missing
- objects. We assume that the promisor remote has a complete view of the
+- Dynamic object fetching will only ask promisor remotes for missing
+ objects. We assume that promisor remotes have a complete view of the
repository and can satisfy all such requests.
- Repack essentially treats promisor and non-promisor packfiles as 2
Future Work
-----------
-- Allow more than one promisor remote and define a strategy for fetching
- missing objects from specific promisor remotes or of iterating over the
- set of promisor remotes until a missing object is found.
+- Improve the way to specify the order in which promisor remotes are
+ tried.
+
-A user might want to have multiple geographically-close cache servers
-for fetching missing blobs while continuing to do filtered `git-fetch`
-commands from the central server, for example.
+For example this could allow to specify explicitly something like:
+"When fetching from this remote, I want to use these promisor remotes
+in this order, though, when pushing or fetching to that remote, I want
+to use those promisor remotes in that order."
+
+- Allow pushing to promisor remotes.
+
-Or the user might want to work in a triangular work flow with multiple
+The user might want to work in a triangular work flow with multiple
promisor remotes that each have an incomplete view of the repository.
- Allow repack to work on promisor packfiles (while keeping them distinct
------------
There are two different types of capabilities: normal capabilities,
-which can be used to to convey information or alter the behavior of a
+which can be used to convey information or alter the behavior of a
request, and commands, which are the core actions that a client wants to
perform (fetch, push, etc).
while heads are expected to advance as development progresses.
Create a new branch head pointing to one of these versions and check it
-out using linkgit:git-checkout[1]:
+out using linkgit:git-switch[1]:
------------------------------------------------
-$ git checkout -b new v2.6.13
+$ git switch -c new v2.6.13
------------------------------------------------
The working directory then reflects the contents that the project had
this command will fail with a warning.
`git branch -D <branch>`::
delete the branch `<branch>` irrespective of its merged status.
-`git checkout <branch>`::
+`git switch <branch>`::
make the current branch `<branch>`, updating the working
directory to reflect the version referenced by `<branch>`.
-`git checkout -b <new> <start-point>`::
+`git switch -c <new> <start-point>`::
create a new branch `<new>` referencing `<start-point>`, and
check it out.
Examining an old version without creating a new branch
------------------------------------------------------
-The `git checkout` command normally expects a branch head, but will also
-accept an arbitrary commit; for example, you can check out the commit
-referenced by a tag:
+The `git switch` command normally expects a branch head, but will also
+accept an arbitrary commit when invoked with --detach; for example,
+you can check out the commit referenced by a tag:
------------------------------------------------
-$ git checkout v2.6.17
+$ git switch --detach v2.6.17
Note: checking out 'v2.6.17'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+state without impacting any branches by performing another switch.
If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+do so (now or later) by using -c with the switch command again. Example:
- git checkout -b new_branch_name
+ git switch -c new_branch_name
HEAD is now at 427abfa Linux v2.6.17
------------------------------------------------
on a branch of your own, just as you would for a tag:
------------------------------------------------
-$ git checkout -b my-todo-copy origin/todo
+$ git switch -c my-todo-copy origin/todo
------------------------------------------------
You can also check out `origin/todo` directly to examine it or
away, you can always return to the pre-merge state with
-------------------------------------------------
-$ git reset --hard HEAD
+$ git merge --abort
-------------------------------------------------
Or, if you've already committed the merge that you want to throw away,
state with
-------------------------------------------------
-$ git reset --hard HEAD
+$ git restore --staged --worktree :/
-------------------------------------------------
If you make a commit that you later wish you hadn't, there are two
In the process of undoing a previous bad change, you may find it
useful to check out an older version of a particular file using
-linkgit:git-checkout[1]. We've used `git checkout` before to switch
-branches, but it has quite different behavior if it is given a path
-name: the command
+linkgit:git-restore[1]. The command
-------------------------------------------------
-$ git checkout HEAD^ path/to/file
+$ git restore --source=HEAD^ path/to/file
-------------------------------------------------
replaces path/to/file by the contents it had in the commit HEAD^, and
These can be easily kept up to date using linkgit:git-pull[1].
-------------------------------------------------
-$ git checkout test && git pull
-$ git checkout release && git pull
+$ git switch test && git pull
+$ git switch release && git pull
-------------------------------------------------
Important note! If you have any local changes in these branches, then
2) help future bug hunters that use `git bisect` to find problems
-------------------------------------------------
-$ git checkout -b speed-up-spinlocks v2.6.35
+$ git switch -c speed-up-spinlocks v2.6.35
-------------------------------------------------
Now you apply the patch(es), run some tests, and commit the change(s). If
"test" branch in preparation to make it public:
-------------------------------------------------
-$ git checkout test && git merge speed-up-spinlocks
+$ git switch test && git merge speed-up-spinlocks
-------------------------------------------------
It is unlikely that you would have any conflicts here ... but you might if you
means that the patches can be moved into the `release` tree in any order.
-------------------------------------------------
-$ git checkout release && git merge speed-up-spinlocks
+$ git switch release && git merge speed-up-spinlocks
-------------------------------------------------
After a while, you will have a number of branches, and despite the
`origin`, and create some commits on top of it:
-------------------------------------------------
-$ git checkout -b mywork origin
+$ git switch -c mywork origin
$ vi file.txt
$ git commit
$ vi otherfile.txt
linkgit:git-rebase[1]:
-------------------------------------------------
-$ git checkout mywork
+$ git switch mywork
$ git rebase origin
-------------------------------------------------
new commit:
-------------------------------------------------
-$ git checkout master
+$ git switch master
-------------------------------------------------
or
-------------------------------------------------
-$ git checkout -b fix-up
+$ git switch -c fix-up
-------------------------------------------------
then
The Workflow
------------
-High-level operations such as linkgit:git-commit[1],
-linkgit:git-checkout[1] and linkgit:git-reset[1] work by moving data
+High-level operations such as linkgit:git-commit[1] and
+linkgit:git-restore[1] work by moving data
between the working tree, the index, and the object database. Git
provides low-level operations which perform each of these steps
individually.
A good place to start is with the contents of the initial commit, with:
----------------------------------------------------
-$ git checkout e83c5163
+$ git switch --detach e83c5163
----------------------------------------------------
The initial revision lays the foundation for almost everything Git has
-----------------
-----------------------------------------------
-$ git branch # list all local branches in this repo
-$ git checkout test # switch working directory to branch "test"
-$ git branch new # create branch "new" starting at current HEAD
-$ git branch -d new # delete branch "new"
+$ git branch # list all local branches in this repo
+$ git switch test # switch working directory to branch "test"
+$ git branch new # create branch "new" starting at current HEAD
+$ git branch -d new # delete branch "new"
-----------------------------------------------
Instead of basing a new branch on current HEAD (the default), use:
Create and switch to a new branch at the same time:
-----------------------------------------------
-$ git checkout -b new v2.6.15
+$ git switch -c new v2.6.15
-----------------------------------------------
Update and examine branches from the repository you cloned from:
origin/master
origin/next
...
-$ git checkout -b masterwork origin/master
+$ git switch -c masterwork origin/master
-----------------------------------------------
Fetch a branch from a different repository, and give it a new
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.22.1
+DEF_VER=v2.23.GIT
LF='
'
#
# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
#
-# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
-# that tells runtime paths to dynamic libraries;
-# "-Wl,-rpath=/path/lib" is used instead.
-#
# Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
# as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
#
SCRIPT_LIB += git-mergetool--lib
SCRIPT_LIB += git-parse-remote
-SCRIPT_LIB += git-rebase--am
-SCRIPT_LIB += git-rebase--common
SCRIPT_LIB += git-rebase--preserve-merges
SCRIPT_LIB += git-sh-setup
SCRIPT_LIB += git-sh-i18n
TEST_BUILTINS_OBJS += test-ctype.o
TEST_BUILTINS_OBJS += test-date.o
TEST_BUILTINS_OBJS += test-delta.o
+TEST_BUILTINS_OBJS += test-dir-iterator.o
TEST_BUILTINS_OBJS += test-drop-caches.o
TEST_BUILTINS_OBJS += test-dump-cache-tree.o
TEST_BUILTINS_OBJS += test-dump-fsmonitor.o
TEST_BUILTINS_OBJS += test-match-trees.o
TEST_BUILTINS_OBJS += test-mergesort.o
TEST_BUILTINS_OBJS += test-mktemp.o
+TEST_BUILTINS_OBJS += test-oidmap.o
TEST_BUILTINS_OBJS += test-online-cpus.o
TEST_BUILTINS_OBJS += test-parse-options.o
TEST_BUILTINS_OBJS += test-path-utils.o
BUILT_INS += git-fsck-objects$X
BUILT_INS += git-init$X
BUILT_INS += git-merge-subtree$X
+BUILT_INS += git-restore$X
BUILT_INS += git-show$X
BUILT_INS += git-stage$X
BUILT_INS += git-status$X
+BUILT_INS += git-switch$X
BUILT_INS += git-whatchanged$X
# what 'all' will build and 'install' will install in gitexecdir,
LIB_OBJS += ewah/ewah_rlw.o
LIB_OBJS += exec-cmd.o
LIB_OBJS += fetch-negotiator.o
-LIB_OBJS += fetch-object.o
LIB_OBJS += fetch-pack.o
LIB_OBJS += fsck.o
LIB_OBJS += fsmonitor.o
LIB_OBJS += pretty.o
LIB_OBJS += prio-queue.o
LIB_OBJS += progress.o
+LIB_OBJS += promisor-remote.o
LIB_OBJS += prompt.o
LIB_OBJS += protocol.o
LIB_OBJS += quote.o
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
LIB_OBJS += replace-object.o
+LIB_OBJS += repo-settings.o
LIB_OBJS += repository.o
LIB_OBJS += rerere.o
LIB_OBJS += resolve-undo.o
BUILTIN_OBJS += builtin/diff-tree.o
BUILTIN_OBJS += builtin/diff.o
BUILTIN_OBJS += builtin/difftool.o
+BUILTIN_OBJS += builtin/env--helper.o
BUILTIN_OBJS += builtin/fast-export.o
BUILTIN_OBJS += builtin/fetch-pack.o
BUILTIN_OBJS += builtin/fetch.o
# which'll override these defaults.
CFLAGS = -g -O2 -Wall
LDFLAGS =
+CC_LD_DYNPATH = -Wl,-rpath,
BASIC_CFLAGS = -I.
BASIC_LDFLAGS =
ifdef SANE_TOOL_PATH
SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
-BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix $(SANE_TOOL_PATH_SQ)|'
+BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
PATH := $(SANE_TOOL_PATH):${PATH}
else
BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
PTHREAD_LIBS =
endif
-ifndef CC_LD_DYNPATH
- ifdef NO_R_TO_GCC_LINKER
- # Some gcc does not accept and pass -R to the linker to specify
- # the runtime dynamic library path.
- CC_LD_DYNPATH = -Wl,-rpath,
- else
- CC_LD_DYNPATH = -R
- endif
-endif
-
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
@mkdir -p bin-wrappers
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
- -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
+ -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%$(X),$(@F))$(patsubst git%,$(X),$(filter $(@F),$(BINDIR_PROGRAMS_NEED_X)))|' < $< > $@ && \
chmod +x $@
# GNU make supports exporting all variables by "export" without parameters.
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+ifdef MSVC
+ # We DO NOT install the individual foo.o.pdb files because they
+ # have already been rolled up into the exe's pdb file.
+ # We DO NOT have pdb files for the builtin commands (like git-status.exe)
+ # because it is just a copy/hardlink of git.exe, rather than a unique binary.
+ $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ $(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ifndef DEBUG
+ $(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+else
+ $(INSTALL) $(vcpkg_dbg_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
+ $(INSTALL) $(vcpkg_dbg_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
+endif
+endif
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
$(RM) GIT-USER-AGENT GIT-PREFIX
$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-VARS
+ifdef MSVC
+ $(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS))
+ $(RM) $(patsubst %.exe,%.pdb,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(OTHER_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.pdb,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(PROGRAMS))
+ $(RM) $(patsubst %.exe,%.pdb,$(TEST_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.iobj,$(TEST_PROGRAMS))
+ $(RM) $(patsubst %.exe,%.ipdb,$(TEST_PROGRAMS))
+ $(RM) compat/vcbuild/MSVC-DEFS-GEN
+endif
.PHONY: all install profile-clean cocciclean clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
-Documentation/RelNotes/2.22.1.txt
\ No newline at end of file
+Documentation/RelNotes/2.24.0.txt
\ No newline at end of file
#include "color.h"
#include "help.h"
+int advice_fetch_show_forced_updates = 1;
int advice_push_update_rejected = 1;
int advice_push_non_ff_current = 1;
int advice_push_non_ff_matching = 1;
int advice_push_unqualified_ref_name = 1;
int advice_status_hints = 1;
int advice_status_u_option = 1;
+int advice_status_ahead_behind_warning = 1;
int advice_commit_before_merge = 1;
int advice_reset_quiet_warning = 1;
int advice_resolve_conflict = 1;
+int advice_sequencer_in_use = 1;
int advice_implicit_identity = 1;
int advice_detached_head = 1;
int advice_set_upstream_failure = 1;
const char *name;
int *preference;
} advice_config[] = {
+ { "fetchShowForcedUpdates", &advice_fetch_show_forced_updates },
{ "pushUpdateRejected", &advice_push_update_rejected },
{ "pushNonFFCurrent", &advice_push_non_ff_current },
{ "pushNonFFMatching", &advice_push_non_ff_matching },
{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
{ "statusHints", &advice_status_hints },
{ "statusUoption", &advice_status_u_option },
+ { "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
{ "commitBeforeMerge", &advice_commit_before_merge },
{ "resetQuiet", &advice_reset_quiet_warning },
{ "resolveConflict", &advice_resolve_conflict },
+ { "sequencerInUse", &advice_sequencer_in_use },
{ "implicitIdentity", &advice_implicit_identity },
{ "detachedHead", &advice_detached_head },
{ "setupStreamFailure", &advice_set_upstream_failure },
void detach_advice(const char *new_name)
{
const char *fmt =
- _("Note: checking out '%s'.\n\n"
+ _("Note: switching to '%s'.\n"
+ "\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
- "state without impacting any branches by performing another checkout.\n\n"
+ "state without impacting any branches by switching back to a branch.\n"
+ "\n"
"If you want to create a new branch to retain commits you create, you may\n"
- "do so (now or later) by using -b with the checkout command again. Example:\n\n"
- " git checkout -b <new-branch-name>\n\n");
+ "do so (now or later) by using -c with the switch command. Example:\n"
+ "\n"
+ " git switch -c <new-branch-name>\n"
+ "\n"
+ "Or undo this operation with:\n"
+ "\n"
+ " git switch -\n"
+ "\n"
+ "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
fprintf(stderr, fmt, new_name);
}
#include "git-compat-util.h"
+extern int advice_fetch_show_forced_updates;
extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_matching;
extern int advice_push_unqualified_ref_name;
extern int advice_status_hints;
extern int advice_status_u_option;
+extern int advice_status_ahead_behind_warning;
extern int advice_commit_before_merge;
extern int advice_reset_quiet_warning;
extern int advice_resolve_conflict;
+extern int advice_sequencer_in_use;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
#include "rerere.h"
#include "apply.h"
+struct gitdiff_data {
+ struct strbuf *root;
+ int linenr;
+ int p_value;
+};
+
static void git_apply_config(void)
{
git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
#define BINARY_DELTA_DEFLATED 1
#define BINARY_LITERAL_DEFLATED 2
-/*
- * This represents a "patch" to a file, both metainfo changes
- * such as creation/deletion, filemode and content changes represented
- * as a series of fragments.
- */
-struct patch {
- char *new_name, *old_name, *def_name;
- unsigned int old_mode, new_mode;
- int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
- int rejected;
- unsigned ws_rule;
- int lines_added, lines_deleted;
- int score;
- int extension_linenr; /* first line specifying delete/new/rename/copy */
- unsigned int is_toplevel_relative:1;
- unsigned int inaccurate_eof:1;
- unsigned int is_binary:1;
- unsigned int is_copy:1;
- unsigned int is_rename:1;
- unsigned int recount:1;
- unsigned int conflicted_threeway:1;
- unsigned int direct_to_threeway:1;
- unsigned int crlf_in_old:1;
- struct fragment *fragments;
- char *result;
- size_t resultsize;
- char old_oid_prefix[GIT_MAX_HEXSZ + 1];
- char new_oid_prefix[GIT_MAX_HEXSZ + 1];
- struct patch *next;
-
- /* three-way fallback result */
- struct object_id threeway_stage[3];
-};
-
static void free_fragment_list(struct fragment *list)
{
while (list) {
return name;
}
-static char *find_name_gnu(struct apply_state *state,
+static char *find_name_gnu(struct strbuf *root,
const char *line,
int p_value)
{
/*
* Proposed "new-style" GNU patch/diff format; see
- * http://marc.info/?l=git&m=112927316408690&w=2
+ * https://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
*/
if (unquote_c_style(&name, line, NULL)) {
strbuf_release(&name);
}
strbuf_remove(&name, 0, cp - name.buf);
- if (state->root.len)
- strbuf_insert(&name, 0, state->root.buf, state->root.len);
+ if (root->len)
+ strbuf_insert(&name, 0, root->buf, root->len);
return squash_slash(strbuf_detach(&name, NULL));
}
return line + len - end;
}
-static char *find_name_common(struct apply_state *state,
+static char *find_name_common(struct strbuf *root,
const char *line,
const char *def,
int p_value,
return squash_slash(xstrdup(def));
}
- if (state->root.len) {
- char *ret = xstrfmt("%s%.*s", state->root.buf, len, start);
+ if (root->len) {
+ char *ret = xstrfmt("%s%.*s", root->buf, len, start);
return squash_slash(ret);
}
return squash_slash(xmemdupz(start, len));
}
-static char *find_name(struct apply_state *state,
+static char *find_name(struct strbuf *root,
const char *line,
char *def,
int p_value,
int terminate)
{
if (*line == '"') {
- char *name = find_name_gnu(state, line, p_value);
+ char *name = find_name_gnu(root, line, p_value);
if (name)
return name;
}
- return find_name_common(state, line, def, p_value, NULL, terminate);
+ return find_name_common(root, line, def, p_value, NULL, terminate);
}
-static char *find_name_traditional(struct apply_state *state,
+static char *find_name_traditional(struct strbuf *root,
const char *line,
char *def,
int p_value)
size_t date_len;
if (*line == '"') {
- char *name = find_name_gnu(state, line, p_value);
+ char *name = find_name_gnu(root, line, p_value);
if (name)
return name;
}
len = strchrnul(line, '\n') - line;
date_len = diff_timestamp_len(line, len);
if (!date_len)
- return find_name_common(state, line, def, p_value, NULL, TERM_TAB);
+ return find_name_common(root, line, def, p_value, NULL, TERM_TAB);
len -= date_len;
- return find_name_common(state, line, def, p_value, line + len, 0);
+ return find_name_common(root, line, def, p_value, line + len, 0);
}
/*
if (is_dev_null(nameline))
return -1;
- name = find_name_traditional(state, nameline, NULL, 0);
+ name = find_name_traditional(&state->root, nameline, NULL, 0);
if (!name)
return -1;
cp = strchr(name, '/');
if (is_dev_null(first)) {
patch->is_new = 1;
patch->is_delete = 0;
- name = find_name_traditional(state, second, NULL, state->p_value);
+ name = find_name_traditional(&state->root, second, NULL, state->p_value);
patch->new_name = name;
} else if (is_dev_null(second)) {
patch->is_new = 0;
patch->is_delete = 1;
- name = find_name_traditional(state, first, NULL, state->p_value);
+ name = find_name_traditional(&state->root, first, NULL, state->p_value);
patch->old_name = name;
} else {
char *first_name;
- first_name = find_name_traditional(state, first, NULL, state->p_value);
- name = find_name_traditional(state, second, first_name, state->p_value);
+ first_name = find_name_traditional(&state->root, first, NULL, state->p_value);
+ name = find_name_traditional(&state->root, second, first_name, state->p_value);
free(first_name);
if (has_epoch_timestamp(first)) {
patch->is_new = 1;
return 0;
}
-static int gitdiff_hdrend(struct apply_state *state,
+static int gitdiff_hdrend(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
#define DIFF_OLD_NAME 0
#define DIFF_NEW_NAME 1
-static int gitdiff_verify_name(struct apply_state *state,
+static int gitdiff_verify_name(struct gitdiff_data *state,
const char *line,
int isnull,
char **name,
int side)
{
if (!*name && !isnull) {
- *name = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ *name = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
return 0;
}
if (isnull)
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr);
- another = find_name(state, line, NULL, state->p_value, TERM_TAB);
+ another = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
if (!another || strcmp(another, *name)) {
free(another);
return error((side == DIFF_NEW_NAME) ?
return 0;
}
-static int gitdiff_oldname(struct apply_state *state,
+static int gitdiff_oldname(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
DIFF_OLD_NAME);
}
-static int gitdiff_newname(struct apply_state *state,
+static int gitdiff_newname(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return 0;
}
-static int gitdiff_oldmode(struct apply_state *state,
+static int gitdiff_oldmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->old_mode);
}
-static int gitdiff_newmode(struct apply_state *state,
+static int gitdiff_newmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->new_mode);
}
-static int gitdiff_delete(struct apply_state *state,
+static int gitdiff_delete(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return gitdiff_oldmode(state, line, patch);
}
-static int gitdiff_newfile(struct apply_state *state,
+static int gitdiff_newfile(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return gitdiff_newmode(state, line, patch);
}
-static int gitdiff_copysrc(struct apply_state *state,
+static int gitdiff_copysrc(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_copy = 1;
free(patch->old_name);
- patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_copydst(struct apply_state *state,
+static int gitdiff_copydst(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_copy = 1;
free(patch->new_name);
- patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamesrc(struct apply_state *state,
+static int gitdiff_renamesrc(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_rename = 1;
free(patch->old_name);
- patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_renamedst(struct apply_state *state,
+static int gitdiff_renamedst(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
patch->is_rename = 1;
free(patch->new_name);
- patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
+ patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
return 0;
}
-static int gitdiff_similarity(struct apply_state *state,
+static int gitdiff_similarity(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return 0;
}
-static int gitdiff_dissimilarity(struct apply_state *state,
+static int gitdiff_dissimilarity(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return 0;
}
-static int gitdiff_index(struct apply_state *state,
+static int gitdiff_index(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
* This is normal for a diff that doesn't change anything: we'll fall through
* into the next diff. Tell the parser to break out.
*/
-static int gitdiff_unrecognized(struct apply_state *state,
+static int gitdiff_unrecognized(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
* Skip p_value leading components from "line"; as we do not accept
* absolute paths, return NULL in that case.
*/
-static const char *skip_tree_prefix(struct apply_state *state,
+static const char *skip_tree_prefix(int p_value,
const char *line,
int llen)
{
int nslash;
int i;
- if (!state->p_value)
+ if (!p_value)
return (llen && line[0] == '/') ? NULL : line;
- nslash = state->p_value;
+ nslash = p_value;
for (i = 0; i < llen; i++) {
int ch = line[i];
if (ch == '/' && --nslash <= 0)
* creation or deletion of an empty file. In any of these cases,
* both sides are the same name under a/ and b/ respectively.
*/
-static char *git_header_name(struct apply_state *state,
+static char *git_header_name(int p_value,
const char *line,
int llen)
{
goto free_and_fail1;
/* strip the a/b prefix including trailing slash */
- cp = skip_tree_prefix(state, first.buf, first.len);
+ cp = skip_tree_prefix(p_value, first.buf, first.len);
if (!cp)
goto free_and_fail1;
strbuf_remove(&first, 0, cp - first.buf);
if (*second == '"') {
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail1;
- cp = skip_tree_prefix(state, sp.buf, sp.len);
+ cp = skip_tree_prefix(p_value, sp.buf, sp.len);
if (!cp)
goto free_and_fail1;
/* They must match, otherwise ignore */
}
/* unquoted second */
- cp = skip_tree_prefix(state, second, line + llen - second);
+ cp = skip_tree_prefix(p_value, second, line + llen - second);
if (!cp)
goto free_and_fail1;
if (line + llen - cp != first.len ||
}
/* unquoted first name */
- name = skip_tree_prefix(state, line, llen);
+ name = skip_tree_prefix(p_value, line, llen);
if (!name)
return NULL;
if (unquote_c_style(&sp, second, NULL))
goto free_and_fail2;
- np = skip_tree_prefix(state, sp.buf, sp.len);
+ np = skip_tree_prefix(p_value, sp.buf, sp.len);
if (!np)
goto free_and_fail2;
*/
if (!name[len + 1])
return NULL; /* no postimage name */
- second = skip_tree_prefix(state, name + len + 1,
+ second = skip_tree_prefix(p_value, name + len + 1,
line_len - (len + 1));
if (!second)
return NULL;
}
}
-static int check_header_line(struct apply_state *state, struct patch *patch)
+static int check_header_line(int linenr, struct patch *patch)
{
int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +
(patch->is_rename == 1) + (patch->is_copy == 1);
if (extensions > 1)
return error(_("inconsistent header lines %d and %d"),
- patch->extension_linenr, state->linenr);
+ patch->extension_linenr, linenr);
if (extensions && !patch->extension_linenr)
- patch->extension_linenr = state->linenr;
+ patch->extension_linenr = linenr;
return 0;
}
-/* Verify that we recognize the lines following a git header */
-static int parse_git_header(struct apply_state *state,
- const char *line,
- int len,
- unsigned int size,
- struct patch *patch)
+int parse_git_diff_header(struct strbuf *root,
+ int *linenr,
+ int p_value,
+ const char *line,
+ int len,
+ unsigned int size,
+ struct patch *patch)
{
unsigned long offset;
+ struct gitdiff_data parse_hdr_state;
/* A git diff has explicit new/delete information, so we don't guess */
patch->is_new = 0;
* or removing or adding empty files), so we get
* the default name from the header.
*/
- patch->def_name = git_header_name(state, line, len);
- if (patch->def_name && state->root.len) {
- char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);
+ patch->def_name = git_header_name(p_value, line, len);
+ if (patch->def_name && root->len) {
+ char *s = xstrfmt("%s%s", root->buf, patch->def_name);
free(patch->def_name);
patch->def_name = s;
}
line += len;
size -= len;
- state->linenr++;
- for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {
+ (*linenr)++;
+ parse_hdr_state.root = root;
+ parse_hdr_state.linenr = *linenr;
+ parse_hdr_state.p_value = p_value;
+
+ for (offset = len ; size > 0 ; offset += len, size -= len, line += len, (*linenr)++) {
static const struct opentry {
const char *str;
- int (*fn)(struct apply_state *, const char *, struct patch *);
+ int (*fn)(struct gitdiff_data *, const char *, struct patch *);
} optable[] = {
{ "@@ -", gitdiff_hdrend },
{ "--- ", gitdiff_oldname },
int res;
if (len < oplen || memcmp(p->str, line, oplen))
continue;
- res = p->fn(state, line + oplen, patch);
+ res = p->fn(&parse_hdr_state, line + oplen, patch);
if (res < 0)
return -1;
- if (check_header_line(state, patch))
+ if (check_header_line(*linenr, patch))
return -1;
if (res > 0)
return offset;
* or mode change, so we handle that specially
*/
if (!memcmp("diff --git ", line, 11)) {
- int git_hdr_len = parse_git_header(state, line, len, size, patch);
+ int git_hdr_len = parse_git_diff_header(&state->root, &state->linenr,
+ state->p_value, line, len,
+ size, patch);
if (git_hdr_len < 0)
return -128;
if (git_hdr_len <= len)
struct patch *list = NULL, **listp = &list;
int skipped_patch = 0;
int res = 0;
+ int flush_attributes = 0;
state->patch_input_file = filename;
if (read_patch_file(&buf, fd) < 0)
patch_stats(state, patch);
*listp = patch;
listp = &patch->next;
+
+ if ((patch->new_name &&
+ ends_with_path_components(patch->new_name,
+ GITATTRIBUTES_FILE)) ||
+ (patch->old_name &&
+ ends_with_path_components(patch->old_name,
+ GITATTRIBUTES_FILE)))
+ flush_attributes = 1;
}
else {
if (state->apply_verbosity > verbosity_normal)
if (state->summary && state->apply_verbosity > verbosity_silent)
summary_patch_list(list);
+ if (flush_attributes)
+ reset_parsed_attributes();
end:
free_patch_list(list);
strbuf_release(&buf);
int applied_after_fixing_ws;
};
+/*
+ * This represents a "patch" to a file, both metainfo changes
+ * such as creation/deletion, filemode and content changes represented
+ * as a series of fragments.
+ */
+struct patch {
+ char *new_name, *old_name, *def_name;
+ unsigned int old_mode, new_mode;
+ int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
+ int rejected;
+ unsigned ws_rule;
+ int lines_added, lines_deleted;
+ int score;
+ int extension_linenr; /* first line specifying delete/new/rename/copy */
+ unsigned int is_toplevel_relative:1;
+ unsigned int inaccurate_eof:1;
+ unsigned int is_binary:1;
+ unsigned int is_copy:1;
+ unsigned int is_rename:1;
+ unsigned int recount:1;
+ unsigned int conflicted_threeway:1;
+ unsigned int direct_to_threeway:1;
+ unsigned int crlf_in_old:1;
+ struct fragment *fragments;
+ char *result;
+ size_t resultsize;
+ char old_oid_prefix[GIT_MAX_HEXSZ + 1];
+ char new_oid_prefix[GIT_MAX_HEXSZ + 1];
+ struct patch *next;
+
+ /* three-way fallback result */
+ struct object_id threeway_stage[3];
+};
+
int apply_parse_options(int argc, const char **argv,
struct apply_state *state,
int *force_apply, int *options,
void clear_apply_state(struct apply_state *state);
int check_apply_state(struct apply_state *state, int force_apply);
+/*
+ * Parse a git diff header, starting at line. Fills the relevant
+ * metadata information in 'struct patch'.
+ *
+ * Returns -1 on failure, the length of the parsed header otherwise.
+ */
+int parse_git_diff_header(struct strbuf *root,
+ int *linenr,
+ int p_value,
+ const char *line,
+ int len,
+ unsigned int size,
+ struct patch *patch);
+
/*
* Some aspects of the apply behavior are controlled by the following
* bits in the "options" parameter passed to apply_all_patches().
* string and appends it to a struct strbuf.
*/
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
- const char *value, unsigned int valuelen)
+ const char *value, size_t valuelen)
{
- int len, tmp;
+ size_t orig_len = sb->len;
+ size_t len, tmp;
/* "%u %s=%s\n" */
len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
- for (tmp = len; tmp > 9; tmp /= 10)
+ for (tmp = 1; len / 10 >= tmp; tmp *= 10)
len++;
strbuf_grow(sb, len);
- strbuf_addf(sb, "%u %s=", len, keyword);
+ strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);
strbuf_add(sb, value, valuelen);
strbuf_addch(sb, '\n');
+
+ if (len != sb->len - orig_len)
+ BUG("pax extended header length miscalculated as %"PRIuMAX
+ ", should be %"PRIuMAX,
+ (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
}
/*
unsigned short mode;
int err;
- err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,
+ err = get_tree_entry(ar_args->repo,
+ &tree->object.oid,
+ prefix, &tree_oid,
&mode);
if (err || !S_ISDIR(mode))
die(_("current working directory is untracked"));
#define vsprintf(...) BANNED(vsprintf)
#else
#define sprintf(buf,fmt,arg) BANNED(sprintf)
-#define vsprintf(buf,fmt,arg) BANNED(sprintf)
+#define vsprintf(buf,fmt,arg) BANNED(vsprintf)
#endif
#endif /* BANNED_H */
struct object_id blob_oid;
unsigned short mode;
- if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
+ if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode) &&
oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)
return;
}
return xdi_diff(file_a, file_b, &xpp, &xecfg, &ecb);
}
+static const char *get_next_line(const char *start, const char *end)
+{
+ const char *nl = memchr(start, '\n', end - start);
+
+ return nl ? nl + 1 : end;
+}
+
+static int find_line_starts(int **line_starts, const char *buf,
+ unsigned long len)
+{
+ const char *end = buf + len;
+ const char *p;
+ int *lineno;
+ int num = 0;
+
+ for (p = buf; p < end; p = get_next_line(p, end))
+ num++;
+
+ ALLOC_ARRAY(*line_starts, num + 1);
+ lineno = *line_starts;
+
+ for (p = buf; p < end; p = get_next_line(p, end))
+ *lineno++ = p - buf;
+
+ *lineno = len;
+
+ return num;
+}
+
+struct fingerprint_entry;
+
+/* A fingerprint is intended to loosely represent a string, such that two
+ * fingerprints can be quickly compared to give an indication of the similarity
+ * of the strings that they represent.
+ *
+ * A fingerprint is represented as a multiset of the lower-cased byte pairs in
+ * the string that it represents. Whitespace is added at each end of the
+ * string. Whitespace pairs are ignored. Whitespace is converted to '\0'.
+ * For example, the string "Darth Radar" will be converted to the following
+ * fingerprint:
+ * {"\0d", "da", "da", "ar", "ar", "rt", "th", "h\0", "\0r", "ra", "ad", "r\0"}
+ *
+ * The similarity between two fingerprints is the size of the intersection of
+ * their multisets, including repeated elements. See fingerprint_similarity for
+ * examples.
+ *
+ * For ease of implementation, the fingerprint is implemented as a map
+ * of byte pairs to the count of that byte pair in the string, instead of
+ * allowing repeated elements in a set.
+ */
+struct fingerprint {
+ struct hashmap map;
+ /* As we know the maximum number of entries in advance, it's
+ * convenient to store the entries in a single array instead of having
+ * the hashmap manage the memory.
+ */
+ struct fingerprint_entry *entries;
+};
+
+/* A byte pair in a fingerprint. Stores the number of times the byte pair
+ * occurs in the string that the fingerprint represents.
+ */
+struct fingerprint_entry {
+ /* The hashmap entry - the hash represents the byte pair in its
+ * entirety so we don't need to store the byte pair separately.
+ */
+ struct hashmap_entry entry;
+ /* The number of times the byte pair occurs in the string that the
+ * fingerprint represents.
+ */
+ int count;
+};
+
+/* See `struct fingerprint` for an explanation of what a fingerprint is.
+ * \param result the fingerprint of the string is stored here. This must be
+ * freed later using free_fingerprint.
+ * \param line_begin the start of the string
+ * \param line_end the end of the string
+ */
+static void get_fingerprint(struct fingerprint *result,
+ const char *line_begin,
+ const char *line_end)
+{
+ unsigned int hash, c0 = 0, c1;
+ const char *p;
+ int max_map_entry_count = 1 + line_end - line_begin;
+ struct fingerprint_entry *entry = xcalloc(max_map_entry_count,
+ sizeof(struct fingerprint_entry));
+ struct fingerprint_entry *found_entry;
+
+ hashmap_init(&result->map, NULL, NULL, max_map_entry_count);
+ result->entries = entry;
+ for (p = line_begin; p <= line_end; ++p, c0 = c1) {
+ /* Always terminate the string with whitespace.
+ * Normalise whitespace to 0, and normalise letters to
+ * lower case. This won't work for multibyte characters but at
+ * worst will match some unrelated characters.
+ */
+ if ((p == line_end) || isspace(*p))
+ c1 = 0;
+ else
+ c1 = tolower(*p);
+ hash = c0 | (c1 << 8);
+ /* Ignore whitespace pairs */
+ if (hash == 0)
+ continue;
+ hashmap_entry_init(entry, hash);
+
+ found_entry = hashmap_get(&result->map, entry, NULL);
+ if (found_entry) {
+ found_entry->count += 1;
+ } else {
+ entry->count = 1;
+ hashmap_add(&result->map, entry);
+ ++entry;
+ }
+ }
+}
+
+static void free_fingerprint(struct fingerprint *f)
+{
+ hashmap_free(&f->map, 0);
+ free(f->entries);
+}
+
+/* Calculates the similarity between two fingerprints as the size of the
+ * intersection of their multisets, including repeated elements. See
+ * `struct fingerprint` for an explanation of the fingerprint representation.
+ * The similarity between "cat mat" and "father rather" is 2 because "at" is
+ * present twice in both strings while the similarity between "tim" and "mit"
+ * is 0.
+ */
+static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b)
+{
+ int intersection = 0;
+ struct hashmap_iter iter;
+ const struct fingerprint_entry *entry_a, *entry_b;
+
+ hashmap_iter_init(&b->map, &iter);
+
+ while ((entry_b = hashmap_iter_next(&iter))) {
+ if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+ intersection += entry_a->count < entry_b->count ?
+ entry_a->count : entry_b->count;
+ }
+ }
+ return intersection;
+}
+
+/* Subtracts byte-pair elements in B from A, modifying A in place.
+ */
+static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b)
+{
+ struct hashmap_iter iter;
+ struct fingerprint_entry *entry_a;
+ const struct fingerprint_entry *entry_b;
+
+ hashmap_iter_init(&b->map, &iter);
+
+ while ((entry_b = hashmap_iter_next(&iter))) {
+ if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) {
+ if (entry_a->count <= entry_b->count)
+ hashmap_remove(&a->map, entry_b, NULL);
+ else
+ entry_a->count -= entry_b->count;
+ }
+ }
+}
+
+/* Calculate fingerprints for a series of lines.
+ * Puts the fingerprints in the fingerprints array, which must have been
+ * preallocated to allow storing line_count elements.
+ */
+static void get_line_fingerprints(struct fingerprint *fingerprints,
+ const char *content, const int *line_starts,
+ long first_line, long line_count)
+{
+ int i;
+ const char *linestart, *lineend;
+
+ line_starts += first_line;
+ for (i = 0; i < line_count; ++i) {
+ linestart = content + line_starts[i];
+ lineend = content + line_starts[i + 1];
+ get_fingerprint(fingerprints + i, linestart, lineend);
+ }
+}
+
+static void free_line_fingerprints(struct fingerprint *fingerprints,
+ int nr_fingerprints)
+{
+ int i;
+
+ for (i = 0; i < nr_fingerprints; i++)
+ free_fingerprint(&fingerprints[i]);
+}
+
+/* This contains the data necessary to linearly map a line number in one half
+ * of a diff chunk to the line in the other half of the diff chunk that is
+ * closest in terms of its position as a fraction of the length of the chunk.
+ */
+struct line_number_mapping {
+ int destination_start, destination_length,
+ source_start, source_length;
+};
+
+/* Given a line number in one range, offset and scale it to map it onto the
+ * other range.
+ * Essentially this mapping is a simple linear equation but the calculation is
+ * more complicated to allow performing it with integer operations.
+ * Another complication is that if a line could map onto many lines in the
+ * destination range then we want to choose the line at the center of those
+ * possibilities.
+ * Example: if the chunk is 2 lines long in A and 10 lines long in B then the
+ * first 5 lines in B will map onto the first line in the A chunk, while the
+ * last 5 lines will all map onto the second line in the A chunk.
+ * Example: if the chunk is 10 lines long in A and 2 lines long in B then line
+ * 0 in B will map onto line 2 in A, and line 1 in B will map onto line 7 in A.
+ */
+static int map_line_number(int line_number,
+ const struct line_number_mapping *mapping)
+{
+ return ((line_number - mapping->source_start) * 2 + 1) *
+ mapping->destination_length /
+ (mapping->source_length * 2) +
+ mapping->destination_start;
+}
+
+/* Get a pointer to the element storing the similarity between a line in A
+ * and a line in B.
+ *
+ * The similarities are stored in a 2-dimensional array. Each "row" in the
+ * array contains the similarities for a line in B. The similarities stored in
+ * a row are the similarities between the line in B and the nearby lines in A.
+ * To keep the length of each row the same, it is padded out with values of -1
+ * where the search range extends beyond the lines in A.
+ * For example, if max_search_distance_a is 2 and the two sides of a diff chunk
+ * look like this:
+ * a | m
+ * b | n
+ * c | o
+ * d | p
+ * e | q
+ * Then the similarity array will contain:
+ * [-1, -1, am, bm, cm,
+ * -1, an, bn, cn, dn,
+ * ao, bo, co, do, eo,
+ * bp, cp, dp, ep, -1,
+ * cq, dq, eq, -1, -1]
+ * Where similarities are denoted either by -1 for invalid, or the
+ * concatenation of the two lines in the diff being compared.
+ *
+ * \param similarities array of similarities between lines in A and B
+ * \param line_a the index of the line in A, in the same frame of reference as
+ * closest_line_a.
+ * \param local_line_b the index of the line in B, relative to the first line
+ * in B that similarities represents.
+ * \param closest_line_a the index of the line in A that is deemed to be
+ * closest to local_line_b. This must be in the same
+ * frame of reference as line_a. This value defines
+ * where similarities is centered for the line in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ */
+static int *get_similarity(int *similarities,
+ int line_a, int local_line_b,
+ int closest_line_a, int max_search_distance_a)
+{
+ assert(abs(line_a - closest_line_a) <=
+ max_search_distance_a);
+ return similarities + line_a - closest_line_a +
+ max_search_distance_a +
+ local_line_b * (max_search_distance_a * 2 + 1);
+}
+
+#define CERTAIN_NOTHING_MATCHES -2
+#define CERTAINTY_NOT_CALCULATED -1
+
+/* Given a line in B, first calculate its similarities with nearby lines in A
+ * if not already calculated, then identify the most similar and second most
+ * similar lines. The "certainty" is calculated based on those two
+ * similarities.
+ *
+ * \param start_a the index of the first line of the chunk in A
+ * \param length_a the length in lines of the chunk in A
+ * \param local_line_b the index of the line in B, relative to the first line
+ * in the chunk.
+ * \param fingerprints_a array of fingerprints for the chunk in A
+ * \param fingerprints_b array of fingerprints for the chunk in B
+ * \param similarities 2-dimensional array of similarities between lines in A
+ * and B. See get_similarity() for more details.
+ * \param certainties array of values indicating how strongly a line in B is
+ * matched with some line in A.
+ * \param second_best_result array of absolute indices in A for the second
+ * closest match of a line in B.
+ * \param result array of absolute indices in A for the closest match of a line
+ * in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ * \param map_line_number_in_b_to_a parameter to map_line_number().
+ */
+static void find_best_line_matches(
+ int start_a,
+ int length_a,
+ int start_b,
+ int local_line_b,
+ struct fingerprint *fingerprints_a,
+ struct fingerprint *fingerprints_b,
+ int *similarities,
+ int *certainties,
+ int *second_best_result,
+ int *result,
+ const int max_search_distance_a,
+ const struct line_number_mapping *map_line_number_in_b_to_a)
+{
+
+ int i, search_start, search_end, closest_local_line_a, *similarity,
+ best_similarity = 0, second_best_similarity = 0,
+ best_similarity_index = 0, second_best_similarity_index = 0;
+
+ /* certainty has already been calculated so no need to redo the work */
+ if (certainties[local_line_b] != CERTAINTY_NOT_CALCULATED)
+ return;
+
+ closest_local_line_a = map_line_number(
+ local_line_b + start_b, map_line_number_in_b_to_a) - start_a;
+
+ search_start = closest_local_line_a - max_search_distance_a;
+ if (search_start < 0)
+ search_start = 0;
+
+ search_end = closest_local_line_a + max_search_distance_a + 1;
+ if (search_end > length_a)
+ search_end = length_a;
+
+ for (i = search_start; i < search_end; ++i) {
+ similarity = get_similarity(similarities,
+ i, local_line_b,
+ closest_local_line_a,
+ max_search_distance_a);
+ if (*similarity == -1) {
+ /* This value will never exceed 10 but assert just in
+ * case
+ */
+ assert(abs(i - closest_local_line_a) < 1000);
+ /* scale the similarity by (1000 - distance from
+ * closest line) to act as a tie break between lines
+ * that otherwise are equally similar.
+ */
+ *similarity = fingerprint_similarity(
+ fingerprints_b + local_line_b,
+ fingerprints_a + i) *
+ (1000 - abs(i - closest_local_line_a));
+ }
+ if (*similarity > best_similarity) {
+ second_best_similarity = best_similarity;
+ second_best_similarity_index = best_similarity_index;
+ best_similarity = *similarity;
+ best_similarity_index = i;
+ } else if (*similarity > second_best_similarity) {
+ second_best_similarity = *similarity;
+ second_best_similarity_index = i;
+ }
+ }
+
+ if (best_similarity == 0) {
+ /* this line definitely doesn't match with anything. Mark it
+ * with this special value so it doesn't get invalidated and
+ * won't be recalculated.
+ */
+ certainties[local_line_b] = CERTAIN_NOTHING_MATCHES;
+ result[local_line_b] = -1;
+ } else {
+ /* Calculate the certainty with which this line matches.
+ * If the line matches well with two lines then that reduces
+ * the certainty. However we still want to prioritise matching
+ * a line that matches very well with two lines over matching a
+ * line that matches poorly with one line, hence doubling
+ * best_similarity.
+ * This means that if we have
+ * line X that matches only one line with a score of 3,
+ * line Y that matches two lines equally with a score of 5,
+ * and line Z that matches only one line with a score or 2,
+ * then the lines in order of certainty are X, Y, Z.
+ */
+ certainties[local_line_b] = best_similarity * 2 -
+ second_best_similarity;
+
+ /* We keep both the best and second best results to allow us to
+ * check at a later stage of the matching process whether the
+ * result needs to be invalidated.
+ */
+ result[local_line_b] = start_a + best_similarity_index;
+ second_best_result[local_line_b] =
+ start_a + second_best_similarity_index;
+ }
+}
+
+/*
+ * This finds the line that we can match with the most confidence, and
+ * uses it as a partition. It then calls itself on the lines on either side of
+ * that partition. In this way we avoid lines appearing out of order, and
+ * retain a sensible line ordering.
+ * \param start_a index of the first line in A with which lines in B may be
+ * compared.
+ * \param start_b index of the first line in B for which matching should be
+ * done.
+ * \param length_a number of lines in A with which lines in B may be compared.
+ * \param length_b number of lines in B for which matching should be done.
+ * \param fingerprints_a mutable array of fingerprints in A. The first element
+ * corresponds to the line at start_a.
+ * \param fingerprints_b array of fingerprints in B. The first element
+ * corresponds to the line at start_b.
+ * \param similarities 2-dimensional array of similarities between lines in A
+ * and B. See get_similarity() for more details.
+ * \param certainties array of values indicating how strongly a line in B is
+ * matched with some line in A.
+ * \param second_best_result array of absolute indices in A for the second
+ * closest match of a line in B.
+ * \param result array of absolute indices in A for the closest match of a line
+ * in B.
+ * \param max_search_distance_a maximum distance in lines from the closest line
+ * in A for other lines in A for which
+ * similarities may be calculated.
+ * \param max_search_distance_b an upper bound on the greatest possible
+ * distance between lines in B such that they will
+ * both be compared with the same line in A
+ * according to max_search_distance_a.
+ * \param map_line_number_in_b_to_a parameter to map_line_number().
+ */
+static void fuzzy_find_matching_lines_recurse(
+ int start_a, int start_b,
+ int length_a, int length_b,
+ struct fingerprint *fingerprints_a,
+ struct fingerprint *fingerprints_b,
+ int *similarities,
+ int *certainties,
+ int *second_best_result,
+ int *result,
+ int max_search_distance_a,
+ int max_search_distance_b,
+ const struct line_number_mapping *map_line_number_in_b_to_a)
+{
+ int i, invalidate_min, invalidate_max, offset_b,
+ second_half_start_a, second_half_start_b,
+ second_half_length_a, second_half_length_b,
+ most_certain_line_a, most_certain_local_line_b = -1,
+ most_certain_line_certainty = -1,
+ closest_local_line_a;
+
+ for (i = 0; i < length_b; ++i) {
+ find_best_line_matches(start_a,
+ length_a,
+ start_b,
+ i,
+ fingerprints_a,
+ fingerprints_b,
+ similarities,
+ certainties,
+ second_best_result,
+ result,
+ max_search_distance_a,
+ map_line_number_in_b_to_a);
+
+ if (certainties[i] > most_certain_line_certainty) {
+ most_certain_line_certainty = certainties[i];
+ most_certain_local_line_b = i;
+ }
+ }
+
+ /* No matches. */
+ if (most_certain_local_line_b == -1)
+ return;
+
+ most_certain_line_a = result[most_certain_local_line_b];
+
+ /*
+ * Subtract the most certain line's fingerprint in B from the matched
+ * fingerprint in A. This means that other lines in B can't also match
+ * the same parts of the line in A.
+ */
+ fingerprint_subtract(fingerprints_a + most_certain_line_a - start_a,
+ fingerprints_b + most_certain_local_line_b);
+
+ /* Invalidate results that may be affected by the choice of most
+ * certain line.
+ */
+ invalidate_min = most_certain_local_line_b - max_search_distance_b;
+ invalidate_max = most_certain_local_line_b + max_search_distance_b + 1;
+ if (invalidate_min < 0)
+ invalidate_min = 0;
+ if (invalidate_max > length_b)
+ invalidate_max = length_b;
+
+ /* As the fingerprint in A has changed, discard previously calculated
+ * similarity values with that fingerprint.
+ */
+ for (i = invalidate_min; i < invalidate_max; ++i) {
+ closest_local_line_a = map_line_number(
+ i + start_b, map_line_number_in_b_to_a) - start_a;
+
+ /* Check that the lines in A and B are close enough that there
+ * is a similarity value for them.
+ */
+ if (abs(most_certain_line_a - start_a - closest_local_line_a) >
+ max_search_distance_a) {
+ continue;
+ }
+
+ *get_similarity(similarities, most_certain_line_a - start_a,
+ i, closest_local_line_a,
+ max_search_distance_a) = -1;
+ }
+
+ /* More invalidating of results that may be affected by the choice of
+ * most certain line.
+ * Discard the matches for lines in B that are currently matched with a
+ * line in A such that their ordering contradicts the ordering imposed
+ * by the choice of most certain line.
+ */
+ for (i = most_certain_local_line_b - 1; i >= invalidate_min; --i) {
+ /* In this loop we discard results for lines in B that are
+ * before most-certain-line-B but are matched with a line in A
+ * that is after most-certain-line-A.
+ */
+ if (certainties[i] >= 0 &&
+ (result[i] >= most_certain_line_a ||
+ second_best_result[i] >= most_certain_line_a)) {
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+ }
+ for (i = most_certain_local_line_b + 1; i < invalidate_max; ++i) {
+ /* In this loop we discard results for lines in B that are
+ * after most-certain-line-B but are matched with a line in A
+ * that is before most-certain-line-A.
+ */
+ if (certainties[i] >= 0 &&
+ (result[i] <= most_certain_line_a ||
+ second_best_result[i] <= most_certain_line_a)) {
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+ }
+
+ /* Repeat the matching process for lines before the most certain line.
+ */
+ if (most_certain_local_line_b > 0) {
+ fuzzy_find_matching_lines_recurse(
+ start_a, start_b,
+ most_certain_line_a + 1 - start_a,
+ most_certain_local_line_b,
+ fingerprints_a, fingerprints_b, similarities,
+ certainties, second_best_result, result,
+ max_search_distance_a,
+ max_search_distance_b,
+ map_line_number_in_b_to_a);
+ }
+ /* Repeat the matching process for lines after the most certain line.
+ */
+ if (most_certain_local_line_b + 1 < length_b) {
+ second_half_start_a = most_certain_line_a;
+ offset_b = most_certain_local_line_b + 1;
+ second_half_start_b = start_b + offset_b;
+ second_half_length_a =
+ length_a + start_a - second_half_start_a;
+ second_half_length_b =
+ length_b + start_b - second_half_start_b;
+ fuzzy_find_matching_lines_recurse(
+ second_half_start_a, second_half_start_b,
+ second_half_length_a, second_half_length_b,
+ fingerprints_a + second_half_start_a - start_a,
+ fingerprints_b + offset_b,
+ similarities +
+ offset_b * (max_search_distance_a * 2 + 1),
+ certainties + offset_b,
+ second_best_result + offset_b, result + offset_b,
+ max_search_distance_a,
+ max_search_distance_b,
+ map_line_number_in_b_to_a);
+ }
+}
+
+/* Find the lines in the parent line range that most closely match the lines in
+ * the target line range. This is accomplished by matching fingerprints in each
+ * blame_origin, and choosing the best matches that preserve the line ordering.
+ * See struct fingerprint for details of fingerprint matching, and
+ * fuzzy_find_matching_lines_recurse for details of preserving line ordering.
+ *
+ * The performance is believed to be O(n log n) in the typical case and O(n^2)
+ * in a pathological case, where n is the number of lines in the target range.
+ */
+static int *fuzzy_find_matching_lines(struct blame_origin *parent,
+ struct blame_origin *target,
+ int tlno, int parent_slno, int same,
+ int parent_len)
+{
+ /* We use the terminology "A" for the left hand side of the diff AKA
+ * parent, and "B" for the right hand side of the diff AKA target. */
+ int start_a = parent_slno;
+ int length_a = parent_len;
+ int start_b = tlno;
+ int length_b = same - tlno;
+
+ struct line_number_mapping map_line_number_in_b_to_a = {
+ start_a, length_a, start_b, length_b
+ };
+
+ struct fingerprint *fingerprints_a = parent->fingerprints;
+ struct fingerprint *fingerprints_b = target->fingerprints;
+
+ int i, *result, *second_best_result,
+ *certainties, *similarities, similarity_count;
+
+ /*
+ * max_search_distance_a means that given a line in B, compare it to
+ * the line in A that is closest to its position, and the lines in A
+ * that are no greater than max_search_distance_a lines away from the
+ * closest line in A.
+ *
+ * max_search_distance_b is an upper bound on the greatest possible
+ * distance between lines in B such that they will both be compared
+ * with the same line in A according to max_search_distance_a.
+ */
+ int max_search_distance_a = 10, max_search_distance_b;
+
+ if (length_a <= 0)
+ return NULL;
+
+ if (max_search_distance_a >= length_a)
+ max_search_distance_a = length_a ? length_a - 1 : 0;
+
+ max_search_distance_b = ((2 * max_search_distance_a + 1) * length_b
+ - 1) / length_a;
+
+ result = xcalloc(sizeof(int), length_b);
+ second_best_result = xcalloc(sizeof(int), length_b);
+ certainties = xcalloc(sizeof(int), length_b);
+
+ /* See get_similarity() for details of similarities. */
+ similarity_count = length_b * (max_search_distance_a * 2 + 1);
+ similarities = xcalloc(sizeof(int), similarity_count);
+
+ for (i = 0; i < length_b; ++i) {
+ result[i] = -1;
+ second_best_result[i] = -1;
+ certainties[i] = CERTAINTY_NOT_CALCULATED;
+ }
+
+ for (i = 0; i < similarity_count; ++i)
+ similarities[i] = -1;
+
+ fuzzy_find_matching_lines_recurse(start_a, start_b,
+ length_a, length_b,
+ fingerprints_a + start_a,
+ fingerprints_b + start_b,
+ similarities,
+ certainties,
+ second_best_result,
+ result,
+ max_search_distance_a,
+ max_search_distance_b,
+ &map_line_number_in_b_to_a);
+
+ free(similarities);
+ free(certainties);
+ free(second_best_result);
+
+ return result;
+}
+
+static void fill_origin_fingerprints(struct blame_origin *o)
+{
+ int *line_starts;
+
+ if (o->fingerprints)
+ return;
+ o->num_lines = find_line_starts(&line_starts, o->file.ptr,
+ o->file.size);
+ o->fingerprints = xcalloc(sizeof(struct fingerprint), o->num_lines);
+ get_line_fingerprints(o->fingerprints, o->file.ptr, line_starts,
+ 0, o->num_lines);
+ free(line_starts);
+}
+
+static void drop_origin_fingerprints(struct blame_origin *o)
+{
+ if (o->fingerprints) {
+ free_line_fingerprints(o->fingerprints, o->num_lines);
+ o->num_lines = 0;
+ FREE_AND_NULL(o->fingerprints);
+ }
+}
+
/*
* Given an origin, prepare mmfile_t structure to be used by the
* diff machinery
*/
static void fill_origin_blob(struct diff_options *opt,
- struct blame_origin *o, mmfile_t *file, int *num_read_blob)
+ struct blame_origin *o, mmfile_t *file,
+ int *num_read_blob, int fill_fingerprints)
{
if (!o->file.ptr) {
enum object_type type;
}
else
*file = o->file;
+ if (fill_fingerprints)
+ fill_origin_fingerprints(o);
}
static void drop_origin_blob(struct blame_origin *o)
{
FREE_AND_NULL(o->file.ptr);
+ drop_origin_fingerprints(o);
}
/*
for (ent = sb->ent; ent && (next = ent->next); ent = next) {
if (ent->suspect == next->suspect &&
- ent->s_lno + ent->num_lines == next->s_lno) {
+ ent->s_lno + ent->num_lines == next->s_lno &&
+ ent->ignored == next->ignored &&
+ ent->unblamable == next->unblamable) {
ent->num_lines += next->num_lines;
ent->next = next->next;
blame_origin_decref(next->suspect);
{
if (!is_null_oid(&origin->blob_oid))
return 0;
- if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
+ if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
goto error_out;
if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
goto error_out;
struct blame_origin *parent)
{
int chunk_end_lno;
+ int i;
memset(split, 0, sizeof(struct blame_entry [3]));
+ for (i = 0; i < 3; i++) {
+ split[i].ignored = e->ignored;
+ split[i].unblamable = e->unblamable;
+ }
+
if (e->s_lno < tlno) {
/* there is a pre-chunk part not blamed on parent */
split[0].suspect = blame_origin_incref(e->suspect);
return tail;
}
+/*
+ * Splits a blame entry into two entries at 'len' lines. The original 'e'
+ * consists of len lines, i.e. [e->lno, e->lno + len), and the second part,
+ * which is returned, consists of the remainder: [e->lno + len, e->lno +
+ * e->num_lines). The caller needs to sort out the reference counting for the
+ * new entry's suspect.
+ */
+static struct blame_entry *split_blame_at(struct blame_entry *e, int len,
+ struct blame_origin *new_suspect)
+{
+ struct blame_entry *n = xcalloc(1, sizeof(struct blame_entry));
+
+ n->suspect = new_suspect;
+ n->ignored = e->ignored;
+ n->unblamable = e->unblamable;
+ n->lno = e->lno + len;
+ n->s_lno = e->s_lno + len;
+ n->num_lines = e->num_lines - len;
+ e->num_lines = len;
+ e->score = 0;
+ return n;
+}
+
+struct blame_line_tracker {
+ int is_parent;
+ int s_lno;
+};
+
+static int are_lines_adjacent(struct blame_line_tracker *first,
+ struct blame_line_tracker *second)
+{
+ return first->is_parent == second->is_parent &&
+ first->s_lno + 1 == second->s_lno;
+}
+
+static int scan_parent_range(struct fingerprint *p_fps,
+ struct fingerprint *t_fps, int t_idx,
+ int from, int nr_lines)
+{
+ int sim, p_idx;
+ #define FINGERPRINT_FILE_THRESHOLD 10
+ int best_sim_val = FINGERPRINT_FILE_THRESHOLD;
+ int best_sim_idx = -1;
+
+ for (p_idx = from; p_idx < from + nr_lines; p_idx++) {
+ sim = fingerprint_similarity(&t_fps[t_idx], &p_fps[p_idx]);
+ if (sim < best_sim_val)
+ continue;
+ /* Break ties with the closest-to-target line number */
+ if (sim == best_sim_val && best_sim_idx != -1 &&
+ abs(best_sim_idx - t_idx) < abs(p_idx - t_idx))
+ continue;
+ best_sim_val = sim;
+ best_sim_idx = p_idx;
+ }
+ return best_sim_idx;
+}
+
+/*
+ * The first pass checks the blame entry (from the target) against the parent's
+ * diff chunk. If that fails for a line, the second pass tries to match that
+ * line to any part of parent file. That catches cases where a change was
+ * broken into two chunks by 'context.'
+ */
+static void guess_line_blames(struct blame_origin *parent,
+ struct blame_origin *target,
+ int tlno, int offset, int same, int parent_len,
+ struct blame_line_tracker *line_blames)
+{
+ int i, best_idx, target_idx;
+ int parent_slno = tlno + offset;
+ int *fuzzy_matches;
+
+ fuzzy_matches = fuzzy_find_matching_lines(parent, target,
+ tlno, parent_slno, same,
+ parent_len);
+ for (i = 0; i < same - tlno; i++) {
+ target_idx = tlno + i;
+ if (fuzzy_matches && fuzzy_matches[i] >= 0) {
+ best_idx = fuzzy_matches[i];
+ } else {
+ best_idx = scan_parent_range(parent->fingerprints,
+ target->fingerprints,
+ target_idx, 0,
+ parent->num_lines);
+ }
+ if (best_idx >= 0) {
+ line_blames[i].is_parent = 1;
+ line_blames[i].s_lno = best_idx;
+ } else {
+ line_blames[i].is_parent = 0;
+ line_blames[i].s_lno = target_idx;
+ }
+ }
+ free(fuzzy_matches);
+}
+
+/*
+ * This decides which parts of a blame entry go to the parent (added to the
+ * ignoredp list) and which stay with the target (added to the diffp list). The
+ * actual decision was made in a separate heuristic function, and those answers
+ * for the lines in 'e' are in line_blames. This consumes e, essentially
+ * putting it on a list.
+ *
+ * Note that the blame entries on the ignoredp list are not necessarily sorted
+ * with respect to the parent's line numbers yet.
+ */
+static void ignore_blame_entry(struct blame_entry *e,
+ struct blame_origin *parent,
+ struct blame_entry **diffp,
+ struct blame_entry **ignoredp,
+ struct blame_line_tracker *line_blames)
+{
+ int entry_len, nr_lines, i;
+
+ /*
+ * We carve new entries off the front of e. Each entry comes from a
+ * contiguous chunk of lines: adjacent lines from the same origin
+ * (either the parent or the target).
+ */
+ entry_len = 1;
+ nr_lines = e->num_lines; /* e changes in the loop */
+ for (i = 0; i < nr_lines; i++) {
+ struct blame_entry *next = NULL;
+
+ /*
+ * We are often adjacent to the next line - only split the blame
+ * entry when we have to.
+ */
+ if (i + 1 < nr_lines) {
+ if (are_lines_adjacent(&line_blames[i],
+ &line_blames[i + 1])) {
+ entry_len++;
+ continue;
+ }
+ next = split_blame_at(e, entry_len,
+ blame_origin_incref(e->suspect));
+ }
+ if (line_blames[i].is_parent) {
+ e->ignored = 1;
+ blame_origin_decref(e->suspect);
+ e->suspect = blame_origin_incref(parent);
+ e->s_lno = line_blames[i - entry_len + 1].s_lno;
+ e->next = *ignoredp;
+ *ignoredp = e;
+ } else {
+ e->unblamable = 1;
+ /* e->s_lno is already in the target's address space. */
+ e->next = *diffp;
+ *diffp = e;
+ }
+ assert(e->num_lines == entry_len);
+ e = next;
+ entry_len = 1;
+ }
+ assert(!e);
+}
+
/*
* Process one hunk from the patch between the current suspect for
* blame_entry e and its parent. This first blames any unfinished
* -C options may lead to overlapping/duplicate source line number
* ranges, all we can rely on from sorting/merging is the order of the
* first suspect line number.
+ *
+ * tlno: line number in the target where this chunk begins
+ * same: line number in the target where this chunk ends
+ * offset: add to tlno to get the chunk starting point in the parent
+ * parent_len: number of lines in the parent chunk
*/
static void blame_chunk(struct blame_entry ***dstq, struct blame_entry ***srcq,
- int tlno, int offset, int same,
- struct blame_origin *parent)
+ int tlno, int offset, int same, int parent_len,
+ struct blame_origin *parent,
+ struct blame_origin *target, int ignore_diffs)
{
struct blame_entry *e = **srcq;
- struct blame_entry *samep = NULL, *diffp = NULL;
+ struct blame_entry *samep = NULL, *diffp = NULL, *ignoredp = NULL;
+ struct blame_line_tracker *line_blames = NULL;
while (e && e->s_lno < tlno) {
struct blame_entry *next = e->next;
*/
if (e->s_lno + e->num_lines > tlno) {
/* Move second half to a new record */
- int len = tlno - e->s_lno;
- struct blame_entry *n = xcalloc(1, sizeof (struct blame_entry));
- n->suspect = e->suspect;
- n->lno = e->lno + len;
- n->s_lno = e->s_lno + len;
- n->num_lines = e->num_lines - len;
- e->num_lines = len;
- e->score = 0;
+ struct blame_entry *n;
+
+ n = split_blame_at(e, tlno - e->s_lno, e->suspect);
/* Push new record to diffp */
n->next = diffp;
diffp = n;
*/
samep = NULL;
diffp = NULL;
+
+ if (ignore_diffs && same - tlno > 0) {
+ line_blames = xcalloc(sizeof(struct blame_line_tracker),
+ same - tlno);
+ guess_line_blames(parent, target, tlno, offset, same,
+ parent_len, line_blames);
+ }
+
while (e && e->s_lno < same) {
struct blame_entry *next = e->next;
* Move second half to a new record to be
* processed by later chunks
*/
- int len = same - e->s_lno;
- struct blame_entry *n = xcalloc(1, sizeof (struct blame_entry));
- n->suspect = blame_origin_incref(e->suspect);
- n->lno = e->lno + len;
- n->s_lno = e->s_lno + len;
- n->num_lines = e->num_lines - len;
- e->num_lines = len;
- e->score = 0;
+ struct blame_entry *n;
+
+ n = split_blame_at(e, same - e->s_lno,
+ blame_origin_incref(e->suspect));
/* Push new record to samep */
n->next = samep;
samep = n;
}
- e->next = diffp;
- diffp = e;
+ if (ignore_diffs) {
+ ignore_blame_entry(e, parent, &diffp, &ignoredp,
+ line_blames + e->s_lno - tlno);
+ } else {
+ e->next = diffp;
+ diffp = e;
+ }
e = next;
}
+ free(line_blames);
+ if (ignoredp) {
+ /*
+ * Note ignoredp is not sorted yet, and thus neither is dstq.
+ * That list must be sorted before we queue_blames(). We defer
+ * sorting until after all diff hunks are processed, so that
+ * guess_line_blames() can pick *any* line in the parent. The
+ * slight drawback is that we end up sorting all blame entries
+ * passed to the parent, including those that are unrelated to
+ * changes made by the ignored commit.
+ */
+ **dstq = reverse_blame(ignoredp, **dstq);
+ *dstq = &ignoredp->next;
+ }
**srcq = reverse_blame(diffp, reverse_blame(samep, e));
/* Move across elements that are in the unblamable portion */
if (diffp)
struct blame_chunk_cb_data {
struct blame_origin *parent;
+ struct blame_origin *target;
long offset;
+ int ignore_diffs;
struct blame_entry **dstq;
struct blame_entry **srcq;
};
if (start_a - start_b != d->offset)
die("internal error in blame::blame_chunk_cb");
blame_chunk(&d->dstq, &d->srcq, start_b, start_a - start_b,
- start_b + count_b, d->parent);
+ start_b + count_b, count_a, d->parent, d->target,
+ d->ignore_diffs);
d->offset = start_a + count_a - (start_b + count_b);
return 0;
}
*/
static void pass_blame_to_parent(struct blame_scoreboard *sb,
struct blame_origin *target,
- struct blame_origin *parent)
+ struct blame_origin *parent, int ignore_diffs)
{
mmfile_t file_p, file_o;
struct blame_chunk_cb_data d;
return; /* nothing remains for this target */
d.parent = parent;
+ d.target = target;
d.offset = 0;
+ d.ignore_diffs = ignore_diffs;
d.dstq = &newdest; d.srcq = &target->suspects;
- fill_origin_blob(&sb->revs->diffopt, parent, &file_p, &sb->num_read_blob);
- fill_origin_blob(&sb->revs->diffopt, target, &file_o, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, parent, &file_p,
+ &sb->num_read_blob, ignore_diffs);
+ fill_origin_blob(&sb->revs->diffopt, target, &file_o,
+ &sb->num_read_blob, ignore_diffs);
sb->num_get_patch++;
if (diff_hunks(&file_p, &file_o, blame_chunk_cb, &d, sb->xdl_opts))
oid_to_hex(&parent->commit->object.oid),
oid_to_hex(&target->commit->object.oid));
/* The rest are the same as the parent */
- blame_chunk(&d.dstq, &d.srcq, INT_MAX, d.offset, INT_MAX, parent);
+ blame_chunk(&d.dstq, &d.srcq, INT_MAX, d.offset, INT_MAX, 0,
+ parent, target, 0);
*d.dstq = NULL;
+ if (ignore_diffs)
+ newdest = llist_mergesort(newdest, get_next_blame,
+ set_next_blame,
+ compare_blame_suspect);
queue_blames(sb, parent, newdest);
return;
if (!unblamed)
return; /* nothing remains for this target */
- fill_origin_blob(&sb->revs->diffopt, parent, &file_p, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, parent, &file_p,
+ &sb->num_read_blob, 0);
if (!file_p.ptr)
return;
norigin = get_origin(parent, p->one->path);
oidcpy(&norigin->blob_oid, &p->one->oid);
norigin->mode = p->one->mode;
- fill_origin_blob(&sb->revs->diffopt, norigin, &file_p, &sb->num_read_blob);
+ fill_origin_blob(&sb->revs->diffopt, norigin, &file_p,
+ &sb->num_read_blob, 0);
if (!file_p.ptr)
continue;
blame_origin_incref(porigin);
origin->previous = porigin;
}
- pass_blame_to_parent(sb, origin, porigin);
+ pass_blame_to_parent(sb, origin, porigin, 0);
if (!origin->suspects)
goto finish;
}
+ /*
+ * Pass remaining suspects for ignored commits to their parents.
+ */
+ if (oidset_contains(&sb->ignore_list, &commit->object.oid)) {
+ for (i = 0, sg = first_scapegoat(revs, commit, sb->reverse);
+ i < num_sg && sg;
+ sg = sg->next, i++) {
+ struct blame_origin *porigin = sg_origin[i];
+
+ if (!porigin)
+ continue;
+ pass_blame_to_parent(sb, origin, porigin, 1);
+ /*
+ * Preemptively drop porigin so we can refresh the
+ * fingerprints if we use the parent again, which can
+ * occur if you ignore back-to-back commits.
+ */
+ drop_origin_blob(porigin);
+ if (!origin->suspects)
+ goto finish;
+ }
+ }
+
/*
* Optionally find moves in parents' files.
*/
}
}
-static const char *get_next_line(const char *start, const char *end)
-{
- const char *nl = memchr(start, '\n', end - start);
- return nl ? nl + 1 : end;
-}
-
/*
* To allow quick access to the contents of nth line in the
* final image, prepare an index in the scoreboard.
*/
static int prepare_lines(struct blame_scoreboard *sb)
{
- const char *buf = sb->final_buf;
- unsigned long len = sb->final_buf_size;
- const char *end = buf + len;
- const char *p;
- int *lineno;
- int num = 0;
-
- for (p = buf; p < end; p = get_next_line(p, end))
- num++;
-
- ALLOC_ARRAY(sb->lineno, num + 1);
- lineno = sb->lineno;
-
- for (p = buf; p < end; p = get_next_line(p, end))
- *lineno++ = p - buf;
-
- *lineno = len;
-
- sb->num_lines = num;
+ sb->num_lines = find_line_starts(&sb->lineno, sb->final_buf,
+ sb->final_buf_size);
return sb->num_lines;
}
*/
struct blame_entry *suspects;
mmfile_t file;
+ int num_lines;
+ void *fingerprints;
struct object_id blob_oid;
unsigned short mode;
/* guilty gets set when shipping any suspects to the final
* scanning the lines over and over.
*/
unsigned score;
+ int ignored;
+ int unblamable;
};
/*
/* linked list of blames */
struct blame_entry *ent;
+ struct oidset ignore_list;
+
/* look-up a line in the final buffer */
int num_lines;
int *lineno;
struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_blob_node(r));
+ return create_object(r, oid, alloc_blob_node(r));
return object_as_type(r, obj, OBJ_BLOB, 0);
}
free(real_ref);
}
-void remove_branch_state(struct repository *r)
+void remove_merge_branch_state(struct repository *r)
{
- sequencer_post_commit_cleanup(r);
unlink(git_path_merge_head(r));
unlink(git_path_merge_rr(r));
unlink(git_path_merge_msg(r));
unlink(git_path_merge_mode(r));
+}
+
+void remove_branch_state(struct repository *r, int verbose)
+{
+ sequencer_post_commit_cleanup(r, verbose);
unlink(git_path_squash_msg(r));
+ remove_merge_branch_state(r);
}
void die_if_checked_out(const char *branch, int ignore_current_worktree)
*/
int validate_new_branchname(const char *name, struct strbuf *ref, int force);
+/*
+ * Remove information about the merge state on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_merge_branch_state(struct repository *r);
+
/*
* Remove information about the state of working on the current
* branch. (E.g., MERGE_HEAD)
*/
-void remove_branch_state(struct repository *r);
+void remove_branch_state(struct repository *r, int verbose);
/*
* Configure local branch "local" as downstream to branch "remote"
int cmd_diff(int argc, const char **argv, const char *prefix);
int cmd_diff_tree(int argc, const char **argv, const char *prefix);
int cmd_difftool(int argc, const char **argv, const char *prefix);
+int cmd_env__helper(int argc, const char **argv, const char *prefix);
int cmd_fast_export(int argc, const char **argv, const char *prefix);
int cmd_fetch(int argc, const char **argv, const char *prefix);
int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
int cmd_repack(int argc, const char **argv, const char *prefix);
int cmd_rerere(int argc, const char **argv, const char *prefix);
int cmd_reset(int argc, const char **argv, const char *prefix);
+int cmd_restore(int argc, const char **argv, const char *prefix);
int cmd_rev_list(int argc, const char **argv, const char *prefix);
int cmd_rev_parse(int argc, const char **argv, const char *prefix);
int cmd_revert(int argc, const char **argv, const char *prefix);
int cmd_stash(int argc, const char **argv, const char *prefix);
int cmd_stripspace(int argc, const char **argv, const char *prefix);
int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
+int cmd_switch(int argc, const char **argv, const char *prefix);
int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
int cmd_tag(int argc, const char **argv, const char *prefix);
int cmd_tar_tree(int argc, const char **argv, const char *prefix);
if (merge_tree(remote_tree))
return -1;
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return 0;
}
static int show_progress;
static char repeated_meta_color[COLOR_MAXLEN];
static int coloring_mode;
+static struct string_list ignore_revs_file_list = STRING_LIST_INIT_NODUP;
+static int mark_unblamable_lines;
+static int mark_ignored_lines;
static struct date_mode blame_date_mode = { DATE_ISO8601 };
static size_t blame_date_width;
static struct string_list mailmap = STRING_LIST_INIT_NODUP;
-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_BLAME
+#define DEBUG_BLAME 0
#endif
static unsigned blame_move_score;
}
}
+ if (mark_unblamable_lines && ent->unblamable) {
+ length--;
+ putchar('*');
+ }
+ if (mark_ignored_lines && ent->ignored) {
+ length--;
+ putchar('?');
+ }
printf("%.*s", length, hex);
if (opt & OUTPUT_ANNOTATE_COMPAT) {
const char *name;
parse_date_format(value, &blame_date_mode);
return 0;
}
+ if (!strcmp(var, "blame.ignorerevsfile")) {
+ const char *str;
+ int ret;
+
+ ret = git_config_pathname(&str, var, value);
+ if (ret)
+ return ret;
+ string_list_insert(&ignore_revs_file_list, str);
+ return 0;
+ }
+ if (!strcmp(var, "blame.markunblamablelines")) {
+ mark_unblamable_lines = git_config_bool(var, value);
+ return 0;
+ }
+ if (!strcmp(var, "blame.markignoredlines")) {
+ mark_ignored_lines = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "color.blame.repeatedlines")) {
if (color_parse_mem(value, strlen(value), repeated_meta_color))
warning(_("invalid color '%s' in color.blame.repeatedLines"),
return OBJ_NONE < oid_object_info(the_repository, &oid, NULL);
}
+static void build_ignorelist(struct blame_scoreboard *sb,
+ struct string_list *ignore_revs_file_list,
+ struct string_list *ignore_rev_list)
+{
+ struct string_list_item *i;
+ struct object_id oid;
+
+ oidset_init(&sb->ignore_list, 0);
+ for_each_string_list_item(i, ignore_revs_file_list) {
+ if (!strcmp(i->string, ""))
+ oidset_clear(&sb->ignore_list);
+ else
+ oidset_parse_file(&sb->ignore_list, i->string);
+ }
+ for_each_string_list_item(i, ignore_rev_list) {
+ if (get_oid_committish(i->string, &oid))
+ die(_("cannot find revision %s to ignore"), i->string);
+ oidset_insert(&sb->ignore_list, &oid);
+ }
+}
+
int cmd_blame(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
struct progress_info pi = { NULL, 0 };
struct string_list range_list = STRING_LIST_INIT_NODUP;
+ struct string_list ignore_rev_list = STRING_LIST_INIT_NODUP;
int output_option = 0, opt = 0;
int show_stats = 0;
const char *revs_file = NULL;
OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+ OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("Ignore <rev> when blaming")),
+ OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")),
OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
sb.contents_from = contents_from;
sb.reverse = reverse;
sb.repo = the_repository;
+ build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list);
+ string_list_clear(&ignore_revs_file_list, 0);
+ string_list_clear(&ignore_rev_list, 0);
setup_scoreboard(&sb, path, &o);
lno = sb.num_lines;
if (blame_copy_score)
sb.copy_score = blame_copy_score;
- sb.debug = DEBUG;
+ sb.debug = DEBUG_BLAME;
sb.on_sanity_fail = &sanity_check_on_fail;
sb.show_root = show_root;
GIT_COLOR_NORMAL, /* LOCAL */
GIT_COLOR_GREEN, /* CURRENT */
GIT_COLOR_BLUE, /* UPSTREAM */
+ GIT_COLOR_CYAN, /* WORKTREE */
};
enum color_branch {
BRANCH_COLOR_RESET = 0,
BRANCH_COLOR_REMOTE = 2,
BRANCH_COLOR_LOCAL = 3,
BRANCH_COLOR_CURRENT = 4,
- BRANCH_COLOR_UPSTREAM = 5
+ BRANCH_COLOR_UPSTREAM = 5,
+ BRANCH_COLOR_WORKTREE = 6
};
static const char *color_branch_slots[] = {
[BRANCH_COLOR_LOCAL] = "local",
[BRANCH_COLOR_CURRENT] = "current",
[BRANCH_COLOR_UPSTREAM] = "upstream",
+ [BRANCH_COLOR_WORKTREE] = "worktree",
};
static struct string_list output = STRING_LIST_INIT_DUP;
struct strbuf local = STRBUF_INIT;
struct strbuf remote = STRBUF_INIT;
- strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else) %s%%(end)",
- branch_get_color(BRANCH_COLOR_CURRENT),
- branch_get_color(BRANCH_COLOR_LOCAL));
+ strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else)%%(if)%%(worktreepath)%%(then)+ %s%%(else) %s%%(end)%%(end)",
+ branch_get_color(BRANCH_COLOR_CURRENT),
+ branch_get_color(BRANCH_COLOR_WORKTREE),
+ branch_get_color(BRANCH_COLOR_LOCAL));
strbuf_addf(&remote, " %s",
branch_get_color(BRANCH_COLOR_REMOTE));
strbuf_addf(&local, " %s ", obname.buf);
if (filter->verbose > 1)
+ {
+ strbuf_addf(&local, "%%(if:notequals=*)%%(HEAD)%%(then)%%(if)%%(worktreepath)%%(then)(%s%%(worktreepath)%s) %%(end)%%(end)",
+ branch_get_color(BRANCH_COLOR_WORKTREE), branch_get_color(BRANCH_COLOR_RESET));
strbuf_addf(&local, "%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
"%%(then): %%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
branch_get_color(BRANCH_COLOR_UPSTREAM), branch_get_color(BRANCH_COLOR_RESET));
+ }
else
strbuf_addf(&local, "%%(if)%%(upstream:track)%%(then)%%(upstream:track) %%(end)%%(contents:subject)");
#include "sha1-array.h"
#include "packfile.h"
#include "object-store.h"
+#include "promisor-remote.h"
struct batch_options {
int enabled;
* fall-back to the usual case.
*/
}
- buf = read_object_with_reference(&oid, exp_type, &size, NULL);
+ buf = read_object_with_reference(the_repository,
+ &oid, exp_type, &size, NULL);
break;
default:
if (opt->all_objects) {
struct object_cb_data cb;
- if (repository_format_partial_clone)
- warning("This repository has extensions.partialClone set. Some objects may not be loaded.");
+ if (has_promisor_remote())
+ warning("This repository uses promisor remotes. Some objects may not be loaded.");
cb.opt = opt;
cb.expand = &data;
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
-#include "config.h"
+#include "advice.h"
+#include "blob.h"
+#include "branch.h"
+#include "cache-tree.h"
#include "checkout.h"
+#include "commit.h"
+#include "config.h"
+#include "diff.h"
+#include "dir.h"
+#include "ll-merge.h"
#include "lockfile.h"
+#include "merge-recursive.h"
+#include "object-store.h"
#include "parse-options.h"
#include "refs.h"
-#include "object-store.h"
-#include "commit.h"
+#include "remote.h"
+#include "resolve-undo.h"
+#include "revision.h"
+#include "run-command.h"
+#include "submodule.h"
+#include "submodule-config.h"
#include "tree.h"
#include "tree-walk.h"
-#include "cache-tree.h"
#include "unpack-trees.h"
-#include "dir.h"
-#include "run-command.h"
-#include "merge-recursive.h"
-#include "branch.h"
-#include "diff.h"
-#include "revision.h"
-#include "remote.h"
-#include "blob.h"
+#include "wt-status.h"
#include "xdiff-interface.h"
-#include "ll-merge.h"
-#include "resolve-undo.h"
-#include "submodule-config.h"
-#include "submodule.h"
-#include "advice.h"
-
-static int checkout_optimize_new_branch;
static const char * const checkout_usage[] = {
N_("git checkout [<options>] <branch>"),
NULL,
};
+static const char * const switch_branch_usage[] = {
+ N_("git switch [<options>] [<branch>]"),
+ NULL,
+};
+
+static const char * const restore_usage[] = {
+ N_("git restore [<options>] [--source=<branch>] <file>..."),
+ NULL,
+};
+
struct checkout_opts {
int patch_mode;
int quiet;
int merge;
int force;
int force_detach;
+ int implicit_detach;
int writeout_stage;
int overwrite_ignore;
int ignore_skipworktree;
int show_progress;
int count_checkout_paths;
int overlay_mode;
- /*
- * If new checkout options are added, skip_merge_working_tree
- * should be updated accordingly.
- */
+ int dwim_new_local_branch;
+ int discard_changes;
+ int accept_ref;
+ int accept_pathspec;
+ int switch_branch_doing_nothing_is_ok;
+ int only_merge_on_switching_branches;
+ int can_switch_when_in_progress;
+ int orphan_from_empty_tree;
+ int empty_pathspec_ok;
+ int checkout_index;
+ int checkout_worktree;
+ const char *ignore_unmerged_opt;
+ int ignore_unmerged;
const char *new_branch;
const char *new_branch_force;
int new_branch_log;
enum branch_track track;
struct diff_options diff_options;
+ char *conflict_style;
int branch_exists;
const char *prefix;
struct pathspec pathspec;
+ const char *from_treeish;
struct tree *source_tree;
};
if (pos >= 0) {
struct cache_entry *old = active_cache[pos];
if (ce->ce_mode == old->ce_mode &&
+ !ce_intent_to_add(old) &&
oideq(&ce->oid, &old->oid)) {
old->ce_flags |= CE_UPDATE;
discard_cache_entry(ce);
}
}
+static int checkout_worktree(const struct checkout_opts *opts)
+{
+ struct checkout state = CHECKOUT_INIT;
+ int nr_checkouts = 0, nr_unmerged = 0;
+ int errs = 0;
+ int pos;
+
+ 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) {
+ if (!ce_stage(ce)) {
+ errs |= checkout_entry(ce, &state,
+ NULL, &nr_checkouts);
+ continue;
+ }
+ if (opts->writeout_stage)
+ errs |= checkout_stage(opts->writeout_stage,
+ ce, pos,
+ &state,
+ &nr_checkouts, opts->overlay_mode);
+ else if (opts->merge)
+ errs |= checkout_merged(pos, &state,
+ &nr_unmerged);
+ pos = skip_same_name(ce, pos) - 1;
+ }
+ }
+ remove_marked_cache_entries(&the_index, 1);
+ remove_scheduled_dirs();
+ errs |= finish_delayed_checkout(&state, &nr_checkouts);
+
+ if (opts->count_checkout_paths) {
+ if (nr_unmerged)
+ fprintf_ln(stderr, Q_("Recreated %d merge conflict",
+ "Recreated %d merge conflicts",
+ nr_unmerged),
+ nr_unmerged);
+ if (opts->source_tree)
+ fprintf_ln(stderr, Q_("Updated %d path from %s",
+ "Updated %d paths from %s",
+ nr_checkouts),
+ nr_checkouts,
+ find_unique_abbrev(&opts->source_tree->object.oid,
+ DEFAULT_ABBREV));
+ else if (!nr_unmerged || nr_checkouts)
+ fprintf_ln(stderr, Q_("Updated %d path from the index",
+ "Updated %d paths from the index",
+ nr_checkouts),
+ nr_checkouts);
+ }
+
+ return errs;
+}
+
static int checkout_paths(const struct checkout_opts *opts,
const char *revision)
{
int pos;
- struct checkout state = CHECKOUT_INIT;
static char *ps_matched;
struct object_id rev;
struct commit *head;
int errs = 0;
struct lock_file lock_file = LOCK_INIT;
- int nr_checkouts = 0, nr_unmerged = 0;
+ int checkout_index;
trace2_cmd_mode(opts->patch_mode ? "patch" : "path");
if (opts->new_branch_log)
die(_("'%s' cannot be used with updating paths"), "-l");
- if (opts->force && opts->patch_mode)
- die(_("'%s' cannot be used with updating paths"), "-f");
+ if (opts->ignore_unmerged && opts->patch_mode)
+ die(_("'%s' cannot be used with updating paths"),
+ opts->ignore_unmerged_opt);
if (opts->force_detach)
die(_("'%s' cannot be used with updating paths"), "--detach");
if (opts->merge && opts->patch_mode)
die(_("'%s' cannot be used with %s"), "--merge", "--patch");
- if (opts->force && opts->merge)
- die(_("'%s' cannot be used with %s"), "-f", "-m");
+ if (opts->ignore_unmerged && opts->merge)
+ die(_("'%s' cannot be used with %s"),
+ opts->ignore_unmerged_opt, "-m");
if (opts->new_branch)
die(_("Cannot update paths and switch to branch '%s' at the same time."),
opts->new_branch);
- if (opts->patch_mode)
- return run_add_interactive(revision, "--patch=checkout",
- &opts->pathspec);
+ if (!opts->checkout_worktree && !opts->checkout_index)
+ die(_("neither '%s' or '%s' is specified"),
+ "--staged", "--worktree");
+
+ if (!opts->checkout_worktree && !opts->from_treeish)
+ die(_("'%s' must be used when '%s' is not specified"),
+ "--worktree", "--source");
+
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->writeout_stage)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--ours", "--theirs", "--staged");
+
+ if (opts->checkout_index && !opts->checkout_worktree &&
+ opts->merge)
+ die(_("'%s' or '%s' cannot be used with %s"),
+ "--merge", "--conflict", "--staged");
+
+ if (opts->patch_mode) {
+ const char *patch_mode;
+
+ if (opts->checkout_index && opts->checkout_worktree)
+ patch_mode = "--patch=checkout";
+ else if (opts->checkout_index && !opts->checkout_worktree)
+ patch_mode = "--patch=reset";
+ else if (!opts->checkout_index && opts->checkout_worktree)
+ patch_mode = "--patch=worktree";
+ else
+ BUG("either flag must have been set, worktree=%d, index=%d",
+ opts->checkout_worktree, opts->checkout_index);
+ return run_add_interactive(revision, patch_mode, &opts->pathspec);
+ }
repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(&opts->pathspec) < 0)
if (ce->ce_flags & CE_MATCHED) {
if (!ce_stage(ce))
continue;
- if (opts->force) {
- warning(_("path '%s' is unmerged"), ce->name);
+ if (opts->ignore_unmerged) {
+ if (!opts->quiet)
+ warning(_("path '%s' is unmerged"), ce->name);
} else if (opts->writeout_stage) {
errs |= check_stage(opts->writeout_stage, ce, pos, opts->overlay_mode);
} else if (opts->merge) {
return 1;
/* Now we are committed to check them out */
- state.force = 1;
- state.refresh_cache = 1;
- state.istate = &the_index;
+ if (opts->checkout_worktree)
+ errs |= checkout_worktree(opts);
- enable_delayed_checkout(&state);
- for (pos = 0; pos < active_nr; pos++) {
- struct cache_entry *ce = active_cache[pos];
- if (ce->ce_flags & CE_MATCHED) {
- if (!ce_stage(ce)) {
- errs |= checkout_entry(ce, &state,
- NULL, &nr_checkouts);
- continue;
- }
- if (opts->writeout_stage)
- errs |= checkout_stage(opts->writeout_stage,
- ce, pos,
- &state,
- &nr_checkouts, opts->overlay_mode);
- else if (opts->merge)
- errs |= checkout_merged(pos, &state,
- &nr_unmerged);
- pos = skip_same_name(ce, pos) - 1;
- }
- }
- remove_marked_cache_entries(&the_index, 1);
- remove_scheduled_dirs();
- errs |= finish_delayed_checkout(&state, &nr_checkouts);
+ /*
+ * Allow updating the index when checking out from the index.
+ * This is to save new stat info.
+ */
+ if (opts->checkout_worktree && !opts->checkout_index && !opts->source_tree)
+ checkout_index = 1;
+ else
+ checkout_index = opts->checkout_index;
- if (opts->count_checkout_paths) {
- if (nr_unmerged)
- fprintf_ln(stderr, Q_("Recreated %d merge conflict",
- "Recreated %d merge conflicts",
- nr_unmerged),
- nr_unmerged);
- if (opts->source_tree)
- fprintf_ln(stderr, Q_("Updated %d path from %s",
- "Updated %d paths from %s",
- nr_checkouts),
- nr_checkouts,
- find_unique_abbrev(&opts->source_tree->object.oid,
- DEFAULT_ABBREV));
- else if (!nr_unmerged || nr_checkouts)
- fprintf_ln(stderr, Q_("Updated %d path from the index",
- "Updated %d paths from the index",
- nr_checkouts),
- nr_checkouts);
+ if (checkout_index) {
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ die(_("unable to write new index file"));
+ } else {
+ /*
+ * NEEDSWORK: if --worktree is not specified, we
+ * should save stat info of checked out files in the
+ * index to avoid the next (potentially costly)
+ * refresh. But it's a bit tricker to do...
+ */
+ rollback_lock_file(&lock_file);
}
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
-
read_ref_full("HEAD", 0, &rev, NULL);
head = lookup_commit_reference_gently(the_repository, &rev, 1);
branch->path = strbuf_detach(&buf, NULL);
}
-/*
- * Skip merging the trees, updating the index and working directory if and
- * only if we are creating a new branch via "git checkout -b <new_branch>."
- */
-static int skip_merge_working_tree(const struct checkout_opts *opts,
- const struct branch_info *old_branch_info,
- const struct branch_info *new_branch_info)
-{
- /*
- * Do the merge if sparse checkout is on and the user has not opted in
- * to the optimized behavior
- */
- if (core_apply_sparse_checkout && !checkout_optimize_new_branch)
- return 0;
-
- /*
- * We must do the merge if we are actually moving to a new commit.
- */
- if (!old_branch_info->commit || !new_branch_info->commit ||
- !oideq(&old_branch_info->commit->object.oid,
- &new_branch_info->commit->object.oid))
- return 0;
-
- /*
- * opts->patch_mode cannot be used with switching branches so is
- * not tested here
- */
-
- /*
- * opts->quiet only impacts output so doesn't require a merge
- */
-
- /*
- * Honor the explicit request for a three-way merge or to throw away
- * local changes
- */
- if (opts->merge || opts->force)
- return 0;
-
- /*
- * --detach is documented as "updating the index and the files in the
- * working tree" but this optimization skips those steps so fall through
- * to the regular code path.
- */
- if (opts->force_detach)
- return 0;
-
- /*
- * opts->writeout_stage cannot be used with switching branches so is
- * not tested here
- */
-
- /*
- * Honor the explicit ignore requests
- */
- if (!opts->overwrite_ignore || opts->ignore_skipworktree ||
- opts->ignore_other_worktrees)
- return 0;
-
- /*
- * opts->show_progress only impacts output so doesn't require a merge
- */
-
- /*
- * opts->overlay_mode cannot be used with switching branches so is
- * not tested here
- */
-
- /*
- * If we aren't creating a new branch any changes or updates will
- * happen in the existing branch. Since that could only be updating
- * the index and working directory, we don't want to skip those steps
- * or we've defeated any purpose in running the command.
- */
- if (!opts->new_branch)
- return 0;
-
- /*
- * new_branch_force is defined to "create/reset and checkout a branch"
- * so needs to go through the merge to do the reset
- */
- if (opts->new_branch_force)
- return 0;
-
- /*
- * A new orphaned branch requrires the index and the working tree to be
- * adjusted to <start_point>
- */
- if (opts->new_orphan_branch)
- return 0;
-
- /*
- * Remaining variables are not checkout options but used to track state
- */
-
- /*
- * Do the merge if this is the initial checkout. We cannot use
- * is_cache_unborn() here because the index hasn't been loaded yet
- * so cache_nr and timestamp.sec are always zero.
- */
- if (!file_exists(get_index_file()))
- return 0;
-
- return 1;
-}
-
static int merge_working_tree(const struct checkout_opts *opts,
struct branch_info *old_branch_info,
struct branch_info *new_branch_info,
{
int ret;
struct lock_file lock_file = LOCK_INIT;
+ struct tree *new_tree;
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(NULL) < 0)
return error(_("index file corrupt"));
resolve_undo_clear();
- if (opts->force) {
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
- opts, 1, writeout_error);
+ if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
+ if (new_branch_info->commit)
+ BUG("'switch --orphan' should never accept a commit as starting point");
+ new_tree = parse_tree_indirect(the_hash_algo->empty_tree);
+ } else
+ new_tree = get_commit_tree(new_branch_info->commit);
+ if (opts->discard_changes) {
+ ret = reset_tree(new_tree, opts, 1, writeout_error);
if (ret)
return ret;
} else {
&old_branch_info->commit->object.oid :
the_hash_algo->empty_tree);
init_tree_desc(&trees[0], tree->buffer, tree->size);
- tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
+ parse_tree(new_tree);
+ tree = new_tree;
init_tree_desc(&trees[1], tree->buffer, tree->size);
ret = unpack_trees(2, trees, &topts);
"the following files:\n%s"), sb.buf);
strbuf_release(&sb);
- if (repo_index_has_changes(the_repository,
- get_commit_tree(old_branch_info->commit),
- &sb))
- warning(_("staged changes in the following files may be lost: %s"),
- sb.buf);
- strbuf_release(&sb);
-
/* Do more real merge */
/*
o.verbosity = 0;
work = write_tree_from_memory(&o);
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
+ ret = reset_tree(new_tree,
opts, 1,
writeout_error);
if (ret)
o.branch1 = new_branch_info->name;
o.branch2 = "local";
ret = merge_trees(&o,
- get_commit_tree(new_branch_info->commit),
+ new_tree,
work,
old_tree,
&result);
if (ret < 0)
exit(128);
- ret = reset_tree(get_commit_tree(new_branch_info->commit),
+ ret = reset_tree(new_tree,
opts, 0,
writeout_error);
strbuf_release(&o.obuf);
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
- if (!opts->force && !opts->quiet)
+ if (!opts->discard_changes && !opts->quiet && new_branch_info->commit)
show_local_changes(&new_branch_info->commit->object, &opts->diff_options);
return 0;
delete_reflog(old_branch_info->path);
}
}
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, !opts->quiet);
strbuf_release(&msg);
if (!opts->quiet &&
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD"))))
add_pending_object(&revs, object, oid_to_hex(&object->oid));
for_each_ref(add_pending_uninteresting_ref, &revs);
- add_pending_oid(&revs, "HEAD", &new_commit->object.oid, UNINTERESTING);
+ if (new_commit)
+ add_pending_oid(&revs, "HEAD",
+ &new_commit->object.oid,
+ UNINTERESTING);
if (prepare_revision_walk(&revs))
die(_("internal error in revision walk"));
void *path_to_free;
struct object_id rev;
int flag, writeout_error = 0;
+ int do_merge = 1;
trace2_cmd_mode("branch");
if (old_branch_info.path)
skip_prefix(old_branch_info.path, "refs/heads/", &old_branch_info.name);
+ if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
+ if (new_branch_info->name)
+ BUG("'switch --orphan' should never accept a commit as starting point");
+ new_branch_info->commit = NULL;
+ new_branch_info->name = "(empty)";
+ do_merge = 1;
+ }
+
if (!new_branch_info->name) {
new_branch_info->name = "HEAD";
new_branch_info->commit = old_branch_info.commit;
if (!new_branch_info->commit)
die(_("You are on a branch yet to be born"));
parse_commit_or_die(new_branch_info->commit);
+
+ if (opts->only_merge_on_switching_branches)
+ do_merge = 0;
}
- /* optimize the "checkout -b <new_branch> path */
- if (skip_merge_working_tree(opts, &old_branch_info, new_branch_info)) {
- if (!checkout_optimize_new_branch && !opts->quiet) {
- if (read_cache_preload(NULL) < 0)
- return error(_("index file corrupt"));
- show_local_changes(&new_branch_info->commit->object, &opts->diff_options);
- }
- } else {
+ if (do_merge) {
ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);
if (ret) {
free(path_to_free);
static int git_checkout_config(const char *var, const char *value, void *cb)
{
- if (!strcmp(var, "checkout.optimizenewbranch")) {
- checkout_optimize_new_branch = git_config_bool(var, value);
- return 0;
- }
-
if (!strcmp(var, "diff.ignoresubmodules")) {
struct checkout_opts *opts = cb;
handle_ignore_submodules_arg(&opts->diff_options, value);
return git_xmerge_config(var, value, NULL);
}
+static void setup_new_branch_info_and_source_tree(
+ struct branch_info *new_branch_info,
+ struct checkout_opts *opts,
+ struct object_id *rev,
+ const char *arg)
+{
+ struct tree **source_tree = &opts->source_tree;
+ struct object_id branch_rev;
+
+ new_branch_info->name = arg;
+ setup_branch_path(new_branch_info);
+
+ if (!check_refname_format(new_branch_info->path, 0) &&
+ !read_ref(new_branch_info->path, &branch_rev))
+ oidcpy(rev, &branch_rev);
+ else
+ new_branch_info->path = NULL; /* not an existing branch */
+
+ new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
+ if (!new_branch_info->commit) {
+ /* not a commit */
+ *source_tree = parse_tree_indirect(rev);
+ } else {
+ parse_commit_or_die(new_branch_info->commit);
+ *source_tree = get_commit_tree(new_branch_info->commit);
+ }
+}
+
static int parse_branchname_arg(int argc, const char **argv,
int dwim_new_local_branch_ok,
struct branch_info *new_branch_info,
struct object_id *rev,
int *dwim_remotes_matched)
{
- struct tree **source_tree = &opts->source_tree;
const char **new_branch = &opts->new_branch;
int argcount = 0;
- struct object_id branch_rev;
const char *arg;
int dash_dash_pos;
int has_dash_dash = 0;
if (!argc)
return 0;
+ if (!opts->accept_pathspec) {
+ if (argc > 1)
+ die(_("only one reference expected"));
+ has_dash_dash = 1; /* helps disambiguate */
+ }
+
arg = argv[0];
dash_dash_pos = -1;
for (i = 0; i < argc; i++) {
- if (!strcmp(argv[i], "--")) {
+ if (opts->accept_pathspec && !strcmp(argv[i], "--")) {
dash_dash_pos = i;
break;
}
recover_with_dwim = 0;
/*
- * Accept "git checkout foo" and "git checkout foo --"
- * as candidates for dwim.
+ * Accept "git checkout foo", "git checkout foo --"
+ * and "git switch foo" as candidates for dwim.
*/
if (!(argc == 1 && !has_dash_dash) &&
- !(argc == 2 && has_dash_dash))
+ !(argc == 2 && has_dash_dash) &&
+ opts->accept_pathspec)
recover_with_dwim = 0;
if (recover_with_dwim) {
argv++;
argc--;
- new_branch_info->name = arg;
- setup_branch_path(new_branch_info);
-
- if (!check_refname_format(new_branch_info->path, 0) &&
- !read_ref(new_branch_info->path, &branch_rev))
- oidcpy(rev, &branch_rev);
- else
- new_branch_info->path = NULL; /* not an existing branch */
-
- new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
- if (!new_branch_info->commit) {
- /* not a commit */
- *source_tree = parse_tree_indirect(rev);
- } else {
- parse_commit_or_die(new_branch_info->commit);
- *source_tree = get_commit_tree(new_branch_info->commit);
- }
+ setup_new_branch_info_and_source_tree(new_branch_info, opts, rev, arg);
- if (!*source_tree) /* case (1): want a tree */
+ if (!opts->source_tree) /* case (1): want a tree */
die(_("reference is not a tree: %s"), arg);
+
if (!has_dash_dash) { /* case (3).(d) -> (1) */
/*
* Do not complain the most common case
*/
if (argc)
verify_non_filename(opts->prefix, arg);
- } else {
+ } else if (opts->accept_pathspec) {
argcount++;
argv++;
argc--;
return status;
}
+static void die_expecting_a_branch(const struct branch_info *branch_info)
+{
+ struct object_id oid;
+ char *to_free;
+
+ if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free) == 1) {
+ const char *ref = to_free;
+
+ if (skip_prefix(ref, "refs/tags/", &ref))
+ die(_("a branch is expected, got tag '%s'"), ref);
+ if (skip_prefix(ref, "refs/remotes/", &ref))
+ die(_("a branch is expected, got remote branch '%s'"), ref);
+ die(_("a branch is expected, got '%s'"), ref);
+ }
+ if (branch_info->commit)
+ die(_("a branch is expected, got commit '%s'"), branch_info->name);
+ /*
+ * This case should never happen because we already die() on
+ * non-commit, but just in case.
+ */
+ die(_("a branch is expected, got '%s'"), branch_info->name);
+}
+
+static void die_if_some_operation_in_progress(void)
+{
+ struct wt_status_state state;
+
+ memset(&state, 0, sizeof(state));
+ wt_status_get_state(the_repository, &state, 0);
+
+ if (state.merge_in_progress)
+ die(_("cannot switch branch while merging\n"
+ "Consider \"git merge --quit\" "
+ "or \"git worktree add\"."));
+ if (state.am_in_progress)
+ die(_("cannot switch branch in the middle of an am session\n"
+ "Consider \"git am --quit\" "
+ "or \"git worktree add\"."));
+ if (state.rebase_interactive_in_progress || state.rebase_in_progress)
+ die(_("cannot switch branch while rebasing\n"
+ "Consider \"git rebase --quit\" "
+ "or \"git worktree add\"."));
+ if (state.cherry_pick_in_progress)
+ die(_("cannot switch branch while cherry-picking\n"
+ "Consider \"git cherry-pick --quit\" "
+ "or \"git worktree add\"."));
+ if (state.revert_in_progress)
+ die(_("cannot switch branch while reverting\n"
+ "Consider \"git revert --quit\" "
+ "or \"git worktree add\"."));
+ if (state.bisect_in_progress)
+ warning(_("you are switching branch while bisecting"));
+}
+
static int checkout_branch(struct checkout_opts *opts,
struct branch_info *new_branch_info)
{
die(_("'%s' cannot be used with switching branches"),
"--patch");
- if (!opts->overlay_mode)
+ if (opts->overlay_mode != -1)
die(_("'%s' cannot be used with switching branches"),
- "--no-overlay");
+ "--[no]-overlay");
if (opts->writeout_stage)
die(_("'%s' cannot be used with switching branches"),
if (opts->force && opts->merge)
die(_("'%s' cannot be used with '%s'"), "-f", "-m");
+ if (opts->discard_changes && opts->merge)
+ die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge");
+
if (opts->force_detach && opts->new_branch)
die(_("'%s' cannot be used with '%s'"),
"--detach", "-b/-B/--orphan");
if (opts->new_orphan_branch) {
if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with '%s'"), "--orphan", "-t");
+ if (opts->orphan_from_empty_tree && new_branch_info->name)
+ die(_("'%s' cannot take <start-point>"), "--orphan");
} else if (opts->force_detach) {
if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
die(_("Cannot switch branch to a non-commit '%s'"),
new_branch_info->name);
+ if (!opts->switch_branch_doing_nothing_is_ok &&
+ !new_branch_info->name &&
+ !opts->new_branch &&
+ !opts->force_detach)
+ die(_("missing branch or commit argument"));
+
+ if (!opts->implicit_detach &&
+ !opts->force_detach &&
+ !opts->new_branch &&
+ !opts->new_branch_force &&
+ new_branch_info->name &&
+ !new_branch_info->path)
+ die_expecting_a_branch(new_branch_info);
+
+ if (!opts->can_switch_when_in_progress)
+ die_if_some_operation_in_progress();
+
if (new_branch_info->path && !opts->force_detach && !opts->new_branch &&
!opts->ignore_other_worktrees) {
int flag;
return switch_branches(opts, new_branch_info);
}
-int cmd_checkout(int argc, const char **argv, const char *prefix)
+static struct option *add_common_options(struct checkout_opts *opts,
+ struct option *prevopts)
{
- struct checkout_opts opts;
- struct branch_info new_branch_info;
- char *conflict_style = NULL;
- int dwim_new_local_branch, no_dwim_new_local_branch = 0;
- int dwim_remotes_matched = 0;
struct option options[] = {
- OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
- OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
- N_("create and checkout a new branch")),
- OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
- N_("create/reset and checkout a branch")),
- OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
- OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")),
- OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"),
+ OPT__QUIET(&opts->quiet, N_("suppress progress reporting")),
+ { OPTION_CALLBACK, 0, "recurse-submodules", NULL,
+ "checkout", "control recursive updating of submodules",
+ PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
+ OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")),
+ OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")),
+ OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"),
+ N_("conflict style (merge or diff3)")),
+ OPT_END()
+ };
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
+
+static struct option *add_common_switch_branch_options(
+ struct checkout_opts *opts, struct option *prevopts)
+{
+ struct option options[] = {
+ OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),
+ OPT_SET_INT('t', "track", &opts->track, N_("set upstream info for new branch"),
BRANCH_TRACK_EXPLICIT),
- OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
- OPT_SET_INT_F('2', "ours", &opts.writeout_stage,
+ OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"),
+ PARSE_OPT_NOCOMPLETE),
+ OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
+ OPT_BOOL_F(0, "overwrite-ignore", &opts->overwrite_ignore,
+ N_("update ignored files (default)"),
+ PARSE_OPT_NOCOMPLETE),
+ OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees,
+ N_("do not check if another worktree is holding the given ref")),
+ OPT_END()
+ };
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
+
+static struct option *add_checkout_path_options(struct checkout_opts *opts,
+ struct option *prevopts)
+{
+ struct option options[] = {
+ OPT_SET_INT_F('2', "ours", &opts->writeout_stage,
N_("checkout our version for unmerged files"),
2, PARSE_OPT_NONEG),
- OPT_SET_INT_F('3', "theirs", &opts.writeout_stage,
+ OPT_SET_INT_F('3', "theirs", &opts->writeout_stage,
N_("checkout their version for unmerged files"),
3, PARSE_OPT_NONEG),
- OPT__FORCE(&opts.force, N_("force checkout (throw away local modifications)"),
- PARSE_OPT_NOCOMPLETE),
- OPT_BOOL('m', "merge", &opts.merge, N_("perform a 3-way merge with the new branch")),
- OPT_BOOL_F(0, "overwrite-ignore", &opts.overwrite_ignore,
- N_("update ignored files (default)"),
- PARSE_OPT_NOCOMPLETE),
- OPT_STRING(0, "conflict", &conflict_style, N_("style"),
- N_("conflict style (merge or diff3)")),
- OPT_BOOL('p', "patch", &opts.patch_mode, N_("select hunks interactively")),
- OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree,
+ OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
+ OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
N_("do not limit pathspecs to sparse entries only")),
- OPT_BOOL(0, "no-guess", &no_dwim_new_local_branch,
- N_("do not second guess 'git checkout <no-such-branch>'")),
- OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
- N_("do not check if another worktree is holding the given ref")),
- { OPTION_CALLBACK, 0, "recurse-submodules", NULL,
- "checkout", "control recursive updating of submodules",
- PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
- OPT_BOOL(0, "progress", &opts.show_progress, N_("force progress reporting")),
- OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")),
- OPT_END(),
+ OPT_END()
};
+ struct option *newopts = parse_options_concat(prevopts, options);
+ free(prevopts);
+ return newopts;
+}
+
+static int checkout_main(int argc, const char **argv, const char *prefix,
+ struct checkout_opts *opts, struct option *options,
+ const char * const usagestr[])
+{
+ struct branch_info new_branch_info;
+ int dwim_remotes_matched = 0;
+ int parseopt_flags = 0;
- memset(&opts, 0, sizeof(opts));
memset(&new_branch_info, 0, sizeof(new_branch_info));
- opts.overwrite_ignore = 1;
- opts.prefix = prefix;
- opts.show_progress = -1;
- opts.overlay_mode = -1;
+ opts->overwrite_ignore = 1;
+ opts->prefix = prefix;
+ opts->show_progress = -1;
+
+ git_config(git_checkout_config, opts);
- git_config(git_checkout_config, &opts);
+ opts->track = BRANCH_TRACK_UNSPECIFIED;
- opts.track = BRANCH_TRACK_UNSPECIFIED;
+ if (!opts->accept_pathspec && !opts->accept_ref)
+ BUG("make up your mind, you need to take _something_");
+ if (opts->accept_pathspec && opts->accept_ref)
+ parseopt_flags = PARSE_OPT_KEEP_DASHDASH;
- argc = parse_options(argc, argv, prefix, options, checkout_usage,
- PARSE_OPT_KEEP_DASHDASH);
+ argc = parse_options(argc, argv, prefix, options,
+ usagestr, parseopt_flags);
- dwim_new_local_branch = !no_dwim_new_local_branch;
- if (opts.show_progress < 0) {
- if (opts.quiet)
- opts.show_progress = 0;
+ if (opts->show_progress < 0) {
+ if (opts->quiet)
+ opts->show_progress = 0;
else
- opts.show_progress = isatty(2);
+ opts->show_progress = isatty(2);
}
- if (conflict_style) {
- opts.merge = 1; /* implied */
- git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
+ if (opts->conflict_style) {
+ opts->merge = 1; /* implied */
+ git_xmerge_config("merge.conflictstyle", opts->conflict_style, NULL);
+ }
+ if (opts->force) {
+ opts->discard_changes = 1;
+ opts->ignore_unmerged_opt = "--force";
+ opts->ignore_unmerged = 1;
}
- if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1)
+ if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)
die(_("-b, -B and --orphan are mutually exclusive"));
- if (opts.overlay_mode == 1 && opts.patch_mode)
+ if (opts->overlay_mode == 1 && opts->patch_mode)
die(_("-p and --overlay are mutually exclusive"));
+ if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) {
+ if (opts->checkout_index < 0)
+ opts->checkout_index = 0;
+ if (opts->checkout_worktree < 0)
+ opts->checkout_worktree = 0;
+ } else {
+ if (opts->checkout_index < 0)
+ opts->checkout_index = -opts->checkout_index - 1;
+ if (opts->checkout_worktree < 0)
+ opts->checkout_worktree = -opts->checkout_worktree - 1;
+ }
+ if (opts->checkout_index < 0 || opts->checkout_worktree < 0)
+ BUG("these flags should be non-negative by now");
+ /*
+ * convenient shortcut: "git restore --staged" equals
+ * "git restore --staged --source HEAD"
+ */
+ if (!opts->from_treeish && opts->checkout_index && !opts->checkout_worktree)
+ opts->from_treeish = "HEAD";
+
/*
* From here on, new_branch will contain the branch to be checked out,
* and new_branch_force and new_orphan_branch will tell us which one of
* -b/-B/--orphan is being used.
*/
- if (opts.new_branch_force)
- opts.new_branch = opts.new_branch_force;
+ if (opts->new_branch_force)
+ opts->new_branch = opts->new_branch_force;
- if (opts.new_orphan_branch)
- opts.new_branch = opts.new_orphan_branch;
+ if (opts->new_orphan_branch)
+ opts->new_branch = opts->new_orphan_branch;
/* --track without -b/-B/--orphan should DWIM */
- if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) {
+ if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {
const char *argv0 = argv[0];
if (!argc || !strcmp(argv0, "--"))
die(_("--track needs a branch name"));
argv0 = strchr(argv0, '/');
if (!argv0 || !argv0[1])
die(_("missing branch name; try -b"));
- opts.new_branch = argv0 + 1;
+ opts->new_branch = argv0 + 1;
}
/*
* including "last branch" syntax and DWIM-ery for names of
* remote branches, erroring out for invalid or ambiguous cases.
*/
- if (argc) {
+ if (argc && opts->accept_ref) {
struct object_id rev;
int dwim_ok =
- !opts.patch_mode &&
- dwim_new_local_branch &&
- opts.track == BRANCH_TRACK_UNSPECIFIED &&
- !opts.new_branch;
+ !opts->patch_mode &&
+ opts->dwim_new_local_branch &&
+ opts->track == BRANCH_TRACK_UNSPECIFIED &&
+ !opts->new_branch;
int n = parse_branchname_arg(argc, argv, dwim_ok,
- &new_branch_info, &opts, &rev,
+ &new_branch_info, opts, &rev,
&dwim_remotes_matched);
argv += n;
argc -= n;
+ } else if (!opts->accept_ref && opts->from_treeish) {
+ struct object_id rev;
+
+ if (get_oid_mb(opts->from_treeish, &rev))
+ die(_("could not resolve %s"), opts->from_treeish);
+
+ setup_new_branch_info_and_source_tree(&new_branch_info,
+ opts, &rev,
+ opts->from_treeish);
+
+ if (!opts->source_tree)
+ die(_("reference is not a tree: %s"), opts->from_treeish);
}
+ if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc &&
+ !opts->patch_mode) /* patch mode is special */
+ die(_("you must specify path(s) to restore"));
+
if (argc) {
- parse_pathspec(&opts.pathspec, 0,
- opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
+ parse_pathspec(&opts->pathspec, 0,
+ opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
prefix, argv);
- if (!opts.pathspec.nr)
+ if (!opts->pathspec.nr)
die(_("invalid path specification"));
/*
* Try to give more helpful suggestion.
* new_branch && argc > 1 will be caught later.
*/
- if (opts.new_branch && argc == 1)
+ if (opts->new_branch && argc == 1)
die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
- argv[0], opts.new_branch);
+ argv[0], opts->new_branch);
- if (opts.force_detach)
+ if (opts->force_detach)
die(_("git checkout: --detach does not take a path argument '%s'"),
argv[0]);
- if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
+ if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)
die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."));
}
- if (opts.new_branch) {
+ if (opts->new_branch) {
struct strbuf buf = STRBUF_INIT;
- if (opts.new_branch_force)
- opts.branch_exists = validate_branchname(opts.new_branch, &buf);
+ if (opts->new_branch_force)
+ opts->branch_exists = validate_branchname(opts->new_branch, &buf);
else
- opts.branch_exists =
- validate_new_branchname(opts.new_branch, &buf, 0);
+ opts->branch_exists =
+ validate_new_branchname(opts->new_branch, &buf, 0);
strbuf_release(&buf);
}
UNLEAK(opts);
- if (opts.patch_mode || opts.pathspec.nr) {
- int ret = checkout_paths(&opts, new_branch_info.name);
+ if (opts->patch_mode || opts->pathspec.nr) {
+ int ret = checkout_paths(opts, new_branch_info.name);
if (ret && dwim_remotes_matched > 1 &&
advice_checkout_ambiguous_remote_branch_name)
advise(_("'%s' matched more than one remote tracking branch.\n"
dwim_remotes_matched);
return ret;
} else {
- return checkout_branch(&opts, &new_branch_info);
+ return checkout_branch(opts, &new_branch_info);
}
}
+
+int cmd_checkout(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options;
+ struct option checkout_options[] = {
+ OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
+ N_("create and checkout a new branch")),
+ OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
+ N_("create/reset and checkout a branch")),
+ OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),
+ OPT_BOOL(0, "guess", &opts.dwim_new_local_branch,
+ N_("second guess 'git checkout <no-such-branch>' (default)")),
+ OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.dwim_new_local_branch = 1;
+ opts.switch_branch_doing_nothing_is_ok = 1;
+ opts.only_merge_on_switching_branches = 0;
+ opts.accept_ref = 1;
+ opts.accept_pathspec = 1;
+ opts.implicit_detach = 1;
+ opts.can_switch_when_in_progress = 1;
+ opts.orphan_from_empty_tree = 0;
+ opts.empty_pathspec_ok = 1;
+ opts.overlay_mode = -1;
+ opts.checkout_index = -2; /* default on */
+ opts.checkout_worktree = -2; /* default on */
+
+ options = parse_options_dup(checkout_options);
+ options = add_common_options(&opts, options);
+ options = add_common_switch_branch_options(&opts, options);
+ options = add_checkout_path_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, checkout_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
+
+int cmd_switch(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options = NULL;
+ struct option switch_options[] = {
+ OPT_STRING('c', "create", &opts.new_branch, N_("branch"),
+ N_("create and switch to a new branch")),
+ OPT_STRING('C', "force-create", &opts.new_branch_force, N_("branch"),
+ N_("create/reset and switch to a branch")),
+ OPT_BOOL(0, "guess", &opts.dwim_new_local_branch,
+ N_("second guess 'git switch <no-such-branch>'")),
+ OPT_BOOL(0, "discard-changes", &opts.discard_changes,
+ N_("throw away local modifications")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.dwim_new_local_branch = 1;
+ opts.accept_ref = 1;
+ opts.accept_pathspec = 0;
+ opts.switch_branch_doing_nothing_is_ok = 0;
+ opts.only_merge_on_switching_branches = 1;
+ opts.implicit_detach = 0;
+ opts.can_switch_when_in_progress = 0;
+ opts.orphan_from_empty_tree = 1;
+ opts.overlay_mode = -1;
+
+ options = parse_options_dup(switch_options);
+ options = add_common_options(&opts, options);
+ options = add_common_switch_branch_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, switch_branch_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
+
+int cmd_restore(int argc, const char **argv, const char *prefix)
+{
+ struct checkout_opts opts;
+ struct option *options;
+ struct option restore_options[] = {
+ OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>",
+ N_("which tree-ish to checkout from")),
+ OPT_BOOL('S', "staged", &opts.checkout_index,
+ N_("restore the index")),
+ OPT_BOOL('W', "worktree", &opts.checkout_worktree,
+ N_("restore the working tree (default)")),
+ OPT_BOOL(0, "ignore-unmerged", &opts.ignore_unmerged,
+ N_("ignore unmerged entries")),
+ OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode")),
+ OPT_END()
+ };
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.accept_ref = 0;
+ opts.accept_pathspec = 1;
+ opts.empty_pathspec_ok = 0;
+ opts.overlay_mode = 0;
+ opts.checkout_index = -1; /* default off */
+ opts.checkout_worktree = -2; /* default on */
+ opts.ignore_unmerged_opt = "--ignore-unmerged";
+
+ options = parse_options_dup(restore_options);
+ options = add_common_options(&opts, options);
+ options = add_checkout_path_options(&opts, options);
+
+ ret = checkout_main(argc, argv, prefix, &opts,
+ options, restore_usage);
+ FREE_AND_NULL(options);
+ return ret;
+}
#include "transport.h"
#include "strbuf.h"
#include "dir.h"
+#include "dir-iterator.h"
+#include "iterator.h"
#include "sigchain.h"
#include "branch.h"
#include "remote.h"
static struct string_list option_recurse_submodules = STRING_LIST_INIT_NODUP;
static struct list_objects_filter_options filter_options;
static struct string_list server_options = STRING_LIST_INIT_NODUP;
+static int option_remote_submodules;
static int recurse_submodules_cb(const struct option *opt,
const char *arg, int unset)
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
TRANSPORT_FAMILY_IPV6),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_BOOL(0, "remote-submodules", &option_remote_submodules,
+ N_("any cloned submodules will use their remote-tracking branch")),
OPT_END()
};
add_one_reference, &required);
}
-static void copy_alternates(struct strbuf *src, struct strbuf *dst,
- const char *src_repo)
+static void copy_alternates(struct strbuf *src, const char *src_repo)
{
/*
* Read from the source objects/info/alternates file
fclose(in);
}
+static void mkdir_if_missing(const char *pathname, mode_t mode)
+{
+ struct stat st;
+
+ if (!mkdir(pathname, mode))
+ return;
+
+ if (errno != EEXIST)
+ die_errno(_("failed to create directory '%s'"), pathname);
+ else if (stat(pathname, &st))
+ die_errno(_("failed to stat '%s'"), pathname);
+ else if (!S_ISDIR(st.st_mode))
+ die(_("%s exists and is not a directory"), pathname);
+}
+
static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
- const char *src_repo, int src_baselen)
+ const char *src_repo)
{
- struct dirent *de;
- struct stat buf;
int src_len, dest_len;
- DIR *dir;
-
- dir = opendir(src->buf);
- if (!dir)
- die_errno(_("failed to open '%s'"), src->buf);
-
- if (mkdir(dest->buf, 0777)) {
- if (errno != EEXIST)
- die_errno(_("failed to create directory '%s'"), dest->buf);
- else if (stat(dest->buf, &buf))
- die_errno(_("failed to stat '%s'"), dest->buf);
- else if (!S_ISDIR(buf.st_mode))
- die(_("%s exists and is not a directory"), dest->buf);
- }
+ struct dir_iterator *iter;
+ int iter_status;
+ unsigned int flags;
+
+ mkdir_if_missing(dest->buf, 0777);
+
+ flags = DIR_ITERATOR_PEDANTIC | DIR_ITERATOR_FOLLOW_SYMLINKS;
+ iter = dir_iterator_begin(src->buf, flags);
+
+ if (!iter)
+ die_errno(_("failed to start iterator over '%s'"), src->buf);
strbuf_addch(src, '/');
src_len = src->len;
strbuf_addch(dest, '/');
dest_len = dest->len;
- while ((de = readdir(dir)) != NULL) {
+ while ((iter_status = dir_iterator_advance(iter)) == ITER_OK) {
strbuf_setlen(src, src_len);
- strbuf_addstr(src, de->d_name);
+ strbuf_addstr(src, iter->relative_path);
strbuf_setlen(dest, dest_len);
- strbuf_addstr(dest, de->d_name);
- if (stat(src->buf, &buf)) {
- warning (_("failed to stat %s\n"), src->buf);
- continue;
- }
- if (S_ISDIR(buf.st_mode)) {
- if (de->d_name[0] != '.')
- copy_or_link_directory(src, dest,
- src_repo, src_baselen);
+ strbuf_addstr(dest, iter->relative_path);
+
+ if (S_ISDIR(iter->st.st_mode)) {
+ mkdir_if_missing(dest->buf, 0777);
continue;
}
/* Files that cannot be copied bit-for-bit... */
- if (!strcmp(src->buf + src_baselen, "/info/alternates")) {
- copy_alternates(src, dest, src_repo);
+ if (!fspathcmp(iter->relative_path, "info/alternates")) {
+ copy_alternates(src, src_repo);
continue;
}
if (unlink(dest->buf) && errno != ENOENT)
die_errno(_("failed to unlink '%s'"), dest->buf);
if (!option_no_hardlinks) {
- if (!link(src->buf, dest->buf))
+ if (!link(real_path(src->buf), dest->buf))
continue;
if (option_local > 0)
die_errno(_("failed to create link '%s'"), dest->buf);
if (copy_file_with_time(dest->buf, src->buf, 0666))
die_errno(_("failed to copy file to '%s'"), dest->buf);
}
- closedir(dir);
+
+ if (iter_status != ITER_DONE) {
+ strbuf_setlen(src, src_len);
+ die(_("failed to iterate over '%s'"), src->buf);
+ }
}
static void clone_local(const char *src_repo, const char *dest_repo)
get_common_dir(&dest, dest_repo);
strbuf_addstr(&src, "/objects");
strbuf_addstr(&dest, "/objects");
- copy_or_link_directory(&src, &dest, src_repo, src.len);
+ copy_or_link_directory(&src, &dest, src_repo);
strbuf_release(&src);
strbuf_release(&dest);
}
static const char junk_leave_repo_msg[] =
N_("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");
+ "and retry with 'git restore --source=HEAD :/'\n");
static void remove_junk(void)
{
if (option_verbosity < 0)
argv_array_push(&args, "--quiet");
+ if (option_remote_submodules) {
+ argv_array_push(&args, "--remote");
+ argv_array_push(&args, "--no-fetch");
+ }
+
err = run_command_v_opt(args.argv, RUN_GIT_CMD);
argv_array_clear(&args);
}
transport->server_options = &server_options;
if (filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
transport_set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
- expanded_filter_spec.buf);
+ spec);
transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- strbuf_release(&expanded_filter_spec);
}
if (transport->smart_options && !deepen && !filter_options.choice)
memset(&copts, 0, sizeof(copts));
copts.padding = 1;
- argc = parse_options(argc, argv, "", options, builtin_column_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0);
if (argc)
usage_with_options(builtin_column_usage, options);
if (real_command || command) {
#include "parse-options.h"
#include "repository.h"
#include "commit-graph.h"
+#include "object-store.h"
static char const * const builtin_commit_graph_usage[] = {
N_("git commit-graph [--object-dir <objdir>]"),
N_("git commit-graph read [--object-dir <objdir>]"),
- N_("git commit-graph verify [--object-dir <objdir>]"),
- N_("git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"),
+ N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
NULL
};
static const char * const builtin_commit_graph_verify_usage[] = {
- N_("git commit-graph verify [--object-dir <objdir>]"),
+ N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"),
NULL
};
};
static const char * const builtin_commit_graph_write_usage[] = {
- N_("git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"),
NULL
};
int stdin_packs;
int stdin_commits;
int append;
+ int split;
+ int shallow;
} opts;
-
static int graph_verify(int argc, const char **argv)
{
struct commit_graph *graph = NULL;
int open_ok;
int fd;
struct stat st;
+ int flags = 0;
static struct option builtin_commit_graph_verify_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
N_("dir"),
N_("The object directory to store the graph")),
+ OPT_BOOL(0, "shallow", &opts.shallow,
+ N_("if the commit-graph is split, only verify the tip file")),
OPT_END(),
};
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
+ if (opts.shallow)
+ flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
graph_name = get_commit_graph_filename(opts.obj_dir);
open_ok = open_commit_graph(graph_name, &fd, &st);
- if (!open_ok && errno == ENOENT)
- return 0;
- if (!open_ok)
+ if (!open_ok && errno != ENOENT)
die_errno(_("Could not open commit-graph '%s'"), graph_name);
- graph = load_commit_graph_one_fd_st(fd, &st);
+
FREE_AND_NULL(graph_name);
+ if (open_ok)
+ graph = load_commit_graph_one_fd_st(fd, &st);
+ else
+ graph = read_commit_graph_one(the_repository, opts.obj_dir);
+
+ /* Return failure if open_ok predicted success */
if (!graph)
- return 1;
+ return !!open_ok;
UNLEAK(graph);
- return verify_commit_graph(the_repository, graph);
+ return verify_commit_graph(the_repository, graph, flags);
}
static int graph_read(int argc, const char **argv)
}
extern int read_replace_refs;
+static struct split_commit_graph_opts split_opts;
static int graph_write(int argc, const char **argv)
{
struct string_list *commit_hex = NULL;
struct string_list lines;
int result = 0;
- unsigned int flags = COMMIT_GRAPH_PROGRESS;
+ enum commit_graph_write_flags flags = COMMIT_GRAPH_WRITE_PROGRESS;
static struct option builtin_commit_graph_write_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
N_("start walk at commits listed by stdin")),
OPT_BOOL(0, "append", &opts.append,
N_("include all commits already in the commit-graph file")),
+ OPT_BOOL(0, "split", &opts.split,
+ N_("allow writing an incremental commit-graph file")),
+ OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
+ N_("maximum number of commits in a non-base split commit-graph")),
+ OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
+ N_("maximum ratio between two levels of a split commit-graph")),
+ OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
+ N_("maximum number of commits in a non-base split commit-graph")),
OPT_END(),
};
+ split_opts.size_multiple = 2;
+ split_opts.max_commits = 0;
+ split_opts.expire_time = 0;
+
argc = parse_options(argc, argv, NULL,
builtin_commit_graph_write_options,
builtin_commit_graph_write_usage, 0);
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
if (opts.append)
- flags |= COMMIT_GRAPH_APPEND;
+ flags |= COMMIT_GRAPH_WRITE_APPEND;
+ if (opts.split)
+ flags |= COMMIT_GRAPH_WRITE_SPLIT;
read_replace_refs = 0;
- if (opts.reachable)
- return write_commit_graph_reachable(opts.obj_dir, flags);
+ if (opts.reachable) {
+ if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts))
+ return 1;
+ return 0;
+ }
string_list_init(&lines, 0);
if (opts.stdin_packs || opts.stdin_commits) {
if (opts.stdin_packs)
pack_indexes = &lines;
- if (opts.stdin_commits)
+ if (opts.stdin_commits) {
commit_hex = &lines;
+ flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+ }
UNLEAK(buf);
}
if (write_commit_graph(opts.obj_dir,
pack_indexes,
commit_hex,
- flags))
+ flags,
+ &split_opts))
result = 1;
UNLEAK(lines);
"\n");
static const char empty_cherry_pick_advice_single[] =
-N_("Otherwise, please use 'git reset'\n");
+N_("Otherwise, please use 'git cherry-pick --skip'\n");
static const char empty_cherry_pick_advice_multi[] =
-N_("If you wish to skip this commit, use:\n"
+N_("and then use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n");
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n");
static const char *color_status_slots[] = {
[WT_STATUS_HEADER] = "header",
static struct status_deferred_config {
enum wt_status_format status_format;
int show_branch;
+ enum ahead_behind_flags ahead_behind;
} status_deferred_config = {
STATUS_FORMAT_UNSPECIFIED,
- -1 /* unspecified */
+ -1, /* unspecified */
+ AHEAD_BEHIND_UNSPECIFIED,
};
static void finalize_deferred_config(struct wt_status *s)
if (s->show_branch < 0)
s->show_branch = 0;
+ /*
+ * If the user did not give a "--[no]-ahead-behind" command
+ * line argument *AND* we will print in a human-readable format
+ * (short, long etc.) then we inherit from the status.aheadbehind
+ * config setting. In all other cases (and porcelain V[12] formats
+ * in particular), we inherit _FULL for backwards compatibility.
+ */
+ if (use_deferred_config &&
+ s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
+ s->ahead_behind_flags = status_deferred_config.ahead_behind;
+
if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
s->ahead_behind_flags = AHEAD_BEHIND_FULL;
}
status_deferred_config.show_branch = git_config_bool(k, v);
return 0;
}
+ if (!strcmp(k, "status.aheadbehind")) {
+ status_deferred_config.ahead_behind = git_config_bool(k, v);
+ return 0;
+ }
if (!strcmp(k, "status.showstash")) {
s->show_stash = git_config_bool(k, v);
return 0;
die("%s", err.buf);
}
- sequencer_post_commit_cleanup(the_repository);
+ sequencer_post_commit_cleanup(the_repository, 0);
unlink(git_path_merge_head(the_repository));
unlink(git_path_merge_msg(the_repository));
unlink(git_path_merge_mode(the_repository));
if (commit_index_files())
die(_("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."));
+ "not exceeded, and then \"git restore --staged :/\" to recover."));
if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
- write_commit_graph_reachable(get_object_directory(), 0))
+ write_commit_graph_reachable(get_object_directory(), 0, NULL))
return 1;
repo_rerere(the_repository, 0);
static inline struct commit_name *find_commit_name(const struct object_id *peeled)
{
- return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled->hash);
+ return hashmap_get_from_hash(&names, oidhash(peeled), peeled);
}
static int replace_name(struct commit_name *e,
if (!e) {
e = xmalloc(sizeof(struct commit_name));
oidcpy(&e->peeled, peeled);
- hashmap_entry_init(e, sha1hash(peeled->hash));
+ hashmap_entry_init(e, oidhash(peeled));
hashmap_add(&names, e);
e->path = NULL;
}
--- /dev/null
+#include "builtin.h"
+#include "config.h"
+#include "parse-options.h"
+
+static char const * const env__helper_usage[] = {
+ N_("git env--helper --type=[bool|ulong] <options> <env-var>"),
+ NULL
+};
+
+static enum {
+ ENV_HELPER_TYPE_BOOL = 1,
+ ENV_HELPER_TYPE_ULONG
+} cmdmode = 0;
+
+static int option_parse_type(const struct option *opt, const char *arg,
+ int unset)
+{
+ if (!strcmp(arg, "bool"))
+ cmdmode = ENV_HELPER_TYPE_BOOL;
+ else if (!strcmp(arg, "ulong"))
+ cmdmode = ENV_HELPER_TYPE_ULONG;
+ else
+ die(_("unrecognized --type argument, %s"), arg);
+
+ return 0;
+}
+
+int cmd_env__helper(int argc, const char **argv, const char *prefix)
+{
+ int exit_code = 0;
+ const char *env_variable = NULL;
+ const char *env_default = NULL;
+ int ret;
+ int ret_int, default_int;
+ unsigned long ret_ulong, default_ulong;
+ struct option opts[] = {
+ OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
+ N_("value is given this type"), PARSE_OPT_NONEG,
+ option_parse_type),
+ OPT_STRING(0, "default", &env_default, N_("value"),
+ N_("default for git_env_*(...) to fall back on")),
+ OPT_BOOL(0, "exit-code", &exit_code,
+ N_("be quiet only use git_env_*() value as exit code")),
+ OPT_END(),
+ };
+
+ argc = parse_options(argc, argv, prefix, opts, env__helper_usage,
+ PARSE_OPT_KEEP_UNKNOWN);
+ if (env_default && !*env_default)
+ usage_with_options(env__helper_usage, opts);
+ if (!cmdmode)
+ usage_with_options(env__helper_usage, opts);
+ if (argc != 1)
+ usage_with_options(env__helper_usage, opts);
+ env_variable = argv[0];
+
+ switch (cmdmode) {
+ case ENV_HELPER_TYPE_BOOL:
+ if (env_default) {
+ default_int = git_parse_maybe_bool(env_default);
+ if (default_int == -1) {
+ error(_("option `--default' expects a boolean value with `--type=bool`, not `%s`"),
+ env_default);
+ usage_with_options(env__helper_usage, opts);
+ }
+ } else {
+ default_int = 0;
+ }
+ ret_int = git_env_bool(env_variable, default_int);
+ if (!exit_code)
+ puts(ret_int ? "true" : "false");
+ ret = ret_int;
+ break;
+ case ENV_HELPER_TYPE_ULONG:
+ if (env_default) {
+ if (!git_parse_ulong(env_default, &default_ulong)) {
+ error(_("option `--default' expects an unsigned long value with `--type=ulong`, not `%s`"),
+ env_default);
+ usage_with_options(env__helper_usage, opts);
+ }
+ } else {
+ default_ulong = 0;
+ }
+ ret_ulong = git_env_ulong(env_variable, default_ulong);
+ if (!exit_code)
+ printf("%lu\n", ret_ulong);
+ ret = ret_ulong;
+ break;
+ default:
+ BUG("unknown <type> value");
+ break;
+ }
+
+ return !ret;
+}
static int progress;
static enum { SIGNED_TAG_ABORT, VERBATIM, WARN, WARN_STRIP, STRIP } signed_tag_mode = SIGNED_TAG_ABORT;
static enum { TAG_FILTERING_ABORT, DROP, REWRITE } tag_of_filtered_mode = TAG_FILTERING_ABORT;
+static enum { REENCODE_ABORT, REENCODE_YES, REENCODE_NO } reencode_mode = REENCODE_ABORT;
static int fake_missing_tagger;
static int use_done_feature;
static int no_data;
return 0;
}
+static int parse_opt_reencode_mode(const struct option *opt,
+ const char *arg, int unset)
+{
+ if (unset) {
+ reencode_mode = REENCODE_ABORT;
+ return 0;
+ }
+
+ switch (git_parse_maybe_bool(arg)) {
+ case 0:
+ reencode_mode = REENCODE_NO;
+ break;
+ case 1:
+ reencode_mode = REENCODE_YES;
+ break;
+ default:
+ if (!strcasecmp(arg, "abort"))
+ reencode_mode = REENCODE_ABORT;
+ else
+ return error("Unknown reencoding mode: %s", arg);
+ }
+
+ return 0;
+}
+
static struct decoration idnums;
static uint32_t last_idnum;
if (is_null_oid(oid))
return;
- object = lookup_object(the_repository, oid->hash);
+ object = lookup_object(the_repository, oid);
if (object && object->flags & SHOWN)
return;
&spec->oid));
else {
struct object *object = lookup_object(the_repository,
- spec->oid.hash);
+ &spec->oid);
printf("M %06o :%d ", spec->mode,
get_object_mark(object));
}
bol = memmem(begin, end ? end - begin : strlen(begin),
needle, strlen(needle));
if (!bol)
- return git_commit_encoding;
+ return NULL;
bol += strlen(needle);
eol = strchrnul(bol, '\n');
*eol = '\0';
}
mark_next_object(&commit->object);
- if (anonymize)
+ if (anonymize) {
reencoded = anonymize_commit_message(message);
- else if (!is_encoding_utf8(encoding))
- reencoded = reencode_string(message, "UTF-8", encoding);
+ } else if (encoding) {
+ switch(reencode_mode) {
+ case REENCODE_YES:
+ reencoded = reencode_string(message, "UTF-8", encoding);
+ break;
+ case REENCODE_NO:
+ break;
+ case REENCODE_ABORT:
+ die("Encountered commit-specific encoding %s in commit "
+ "%s; use --reencode=[yes|no] to handle it",
+ encoding, oid_to_hex(&commit->object.oid));
+ }
+ }
if (!commit->parents)
printf("reset %s\n", refname);
printf("commit %s\nmark :%"PRIu32"\n", refname, last_idnum);
if (show_original_ids)
printf("original-oid %s\n", oid_to_hex(&commit->object.oid));
- printf("%.*s\n%.*s\ndata %u\n%s",
+ printf("%.*s\n%.*s\n",
(int)(author_end - author), author,
- (int)(committer_end - committer), committer,
+ (int)(committer_end - committer), committer);
+ if (!reencoded && encoding)
+ printf("encoding %s\n", encoding);
+ printf("data %u\n%s",
(unsigned)(reencoded
? strlen(reencoded) : message
? strlen(message) : 0),
OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, N_("mode"),
N_("select handling of tags that tag filtered objects"),
parse_opt_tag_of_filtered_mode),
+ OPT_CALLBACK(0, "reencode", &reencode_mode, N_("mode"),
+ N_("select handling of commit messages in an alternate encoding"),
+ parse_opt_reencode_mode),
OPT_STRING(0, "export-marks", &export_filename, N_("file"),
N_("Dump marks to this file")),
OPT_STRING(0, "import-marks", &import_filename, N_("file"),
#include "packfile.h"
#include "list-objects-filter-options.h"
#include "commit-reach.h"
+#include "branch.h"
+#include "promisor-remote.h"
+
+#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
static const char * const builtin_fetch_usage[] = {
N_("git fetch [<options>] [<repository> [<refspec>...]]"),
};
static int fetch_prune_config = -1; /* unspecified */
+static int fetch_show_forced_updates = 1;
+static uint64_t forced_updates_ms = 0;
static int prune = -1; /* unspecified */
#define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
static int prune_tags = -1; /* unspecified */
#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
-static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
+static int all, append, dry_run, force, keep, multiple, update_head_ok;
+static int verbosity, deepen_relative, set_upstream;
static int progress = -1;
+static int enable_auto_gc = 1;
static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
static int max_children = 1;
static enum transport_family family;
return 0;
}
+ if (!strcmp(k, "fetch.showforcedupdates")) {
+ fetch_show_forced_updates = git_config_bool(k, v);
+ return 0;
+ }
+
if (!strcmp(k, "submodule.recurse")) {
int r = git_config_bool(k, v) ?
RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "all", &all,
N_("fetch from all remotes")),
+ OPT_BOOL(0, "set-upstream", &set_upstream,
+ N_("set upstream for git pull/fetch")),
OPT_BOOL('a', "append", &append,
N_("append to .git/FETCH_HEAD instead of overwriting")),
OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
N_("report that we have only objects reachable from this object")),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ OPT_BOOL(0, "auto-gc", &enable_auto_gc,
+ N_("run 'gc --auto' after fetching")),
+ OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
+ N_("check for forced-updates on all updated branches")),
OPT_END()
};
enum object_type type;
struct branch *current_branch = branch_get(NULL);
const char *pretty_ref = prettify_refname(ref->name);
+ int fast_forward = 0;
type = oid_object_info(the_repository, &ref->new_oid, NULL);
if (type < 0)
return r;
}
- if (in_merge_bases(current, updated)) {
+ if (fetch_show_forced_updates) {
+ uint64_t t_before = getnanotime();
+ fast_forward = in_merge_bases(current, updated);
+ forced_updates_ms += (getnanotime() - t_before) / 1000000;
+ } else {
+ fast_forward = 1;
+ }
+
+ if (fast_forward) {
struct strbuf quickref = STRBUF_INIT;
int r;
+
strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
strbuf_addstr(&quickref, "..");
strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
return 0;
}
+static const char warn_show_forced_updates[] =
+N_("Fetch normally indicates which branches had a forced update,\n"
+ "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+ "flag or run 'git config fetch.showForcedUpdates true'.");
+static const char warn_time_show_forced_updates[] =
+N_("It took %.2f seconds to check forced updates. You can use\n"
+ "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
+ " to avoid this check.\n");
+
static int store_updated_refs(const char *raw_url, const char *remote_name,
int connectivity_checked, struct ref *ref_map)
{
" 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name);
+ if (advice_fetch_show_forced_updates) {
+ if (!fetch_show_forced_updates) {
+ warning(_(warn_show_forced_updates));
+ } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
+ warning(_(warn_time_show_forced_updates),
+ forced_updates_ms / 1000.0);
+ }
+ }
+
abort:
strbuf_release(¬e);
free(url);
if (update_shallow)
set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
if (filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
- set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
- expanded_filter_spec.buf);
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
+ set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec);
set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- strbuf_release(&expanded_filter_spec);
}
if (negotiation_tip.nr) {
if (transport->smart_options)
retcode = 1;
goto cleanup;
}
+
+ if (set_upstream) {
+ struct branch *branch = branch_get("HEAD");
+ struct ref *rm;
+ struct ref *source_ref = NULL;
+
+ /*
+ * We're setting the upstream configuration for the
+ * current branch. The relevent upstream is the
+ * fetched branch that is meant to be merged with the
+ * current one, i.e. the one fetched to FETCH_HEAD.
+ *
+ * When there are several such branches, consider the
+ * request ambiguous and err on the safe side by doing
+ * nothing and just emit a warning.
+ */
+ for (rm = ref_map; rm; rm = rm->next) {
+ if (!rm->peer_ref) {
+ if (source_ref) {
+ warning(_("multiple branch detected, incompatible with --set-upstream"));
+ goto skip;
+ } else {
+ source_ref = rm;
+ }
+ }
+ }
+ if (source_ref) {
+ if (!strcmp(source_ref->name, "HEAD") ||
+ starts_with(source_ref->name, "refs/heads/"))
+ install_branch_config(0,
+ branch->name,
+ transport->remote->name,
+ source_ref->name);
+ else if (starts_with(source_ref->name, "refs/remotes/"))
+ warning(_("not setting upstream for a remote remote-tracking branch"));
+ else if (starts_with(source_ref->name, "refs/tags/"))
+ warning(_("not setting upstream for a remote tag"));
+ else
+ warning(_("unknown branch type"));
+ } else {
+ warning(_("no source branch found.\n"
+ "you need to specify exactly one branch with the --set-upstream option."));
+ }
+ }
+ skip:
free_refs(ref_map);
/* if neither --no-tags nor --tags was specified, do automated tag
return errcode;
}
- argv_array_pushl(&argv, "fetch", "--append", NULL);
+ argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
add_options_to_argv(&argv);
for (i = 0; i < list->nr; i++) {
* If no prior partial clone/fetch and the current fetch DID NOT
* request a partial-fetch, do a normal fetch.
*/
- if (!repository_format_partial_clone && !filter_options.choice)
+ if (!has_promisor_remote() && !filter_options.choice)
return;
/*
- * If this is the FIRST partial-fetch request, we enable partial
- * on this repo and remember the given filter-spec as the default
- * for subsequent fetches to this remote.
+ * If this is a partial-fetch request, we enable partial on
+ * this repo if not already enabled and remember the given
+ * filter-spec as the default for subsequent fetches to this
+ * remote.
*/
- if (!repository_format_partial_clone && filter_options.choice) {
+ if (filter_options.choice) {
partial_clone_register(remote->name, &filter_options);
return;
}
- /*
- * We are currently limited to only ONE promisor remote and only
- * allow partial-fetches from the promisor remote.
- */
- if (strcmp(remote->name, repository_format_partial_clone)) {
- if (filter_options.choice)
- die(_("--filter can only be used with the remote "
- "configured in extensions.partialClone"));
- return;
- }
-
/*
* Do a partial-fetch from the promisor remote using either the
* explicitly given filter-spec or inherit the filter-spec from
* the config.
*/
if (!filter_options.choice)
- partial_clone_get_default_filter_spec(&filter_options);
+ partial_clone_get_default_filter_spec(&filter_options, remote->name);
return;
}
if (depth || deepen_since || deepen_not.nr)
deepen = 1;
- if (filter_options.choice && !repository_format_partial_clone)
+ if (filter_options.choice && !has_promisor_remote())
die("--filter can only be used when extensions.partialClone is set");
if (all) {
}
if (remote) {
- if (filter_options.choice || repository_format_partial_clone)
+ if (filter_options.choice || has_promisor_remote())
fetch_one_setup_partial(remote);
result = fetch_one(remote, argc, argv, prune_tags_ok);
} else {
close_object_store(the_repository->objects);
- argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
- if (verbosity < 0)
- argv_array_push(&argv_gc_auto, "--quiet");
- run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
- argv_array_clear(&argv_gc_auto);
+ if (enable_auto_gc) {
+ argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
+ if (verbosity < 0)
+ argv_array_push(&argv_gc_auto, "--quiet");
+ run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv_gc_auto);
+ }
return result;
}
static void mark_unreachable_referents(const struct object_id *oid)
{
struct fsck_options options = FSCK_OPTIONS_DEFAULT;
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(the_repository, oid);
if (!obj || !(obj->flags & HAS_OBJ))
return; /* not part of our original set */
struct object *obj;
if (!is_null_oid(oid)) {
- obj = lookup_object(the_repository, oid->hash);
+ obj = lookup_object(the_repository, oid);
if (obj && (obj->flags & HAS_OBJ)) {
if (timestamp && name_objects)
add_decoration(fsck_walk_options.object_names,
static void mark_object_for_connectivity(const struct object_id *oid)
{
- struct object *obj = lookup_unknown_object(oid->hash);
+ struct object *obj = lookup_unknown_object(oid);
obj->flags |= HAS_OBJ;
}
struct object_id oid;
if (!get_oid(arg, &oid)) {
struct object *obj = lookup_object(the_repository,
- oid.hash);
+ &oid);
if (!obj || !(obj->flags & HAS_OBJ)) {
if (is_promisor_object(&oid))
#include "pack-objects.h"
#include "blob.h"
#include "tree.h"
+#include "promisor-remote.h"
#define FAILED_RUN "failed to run %s"
static int aggressive_window = 250;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;
-static int gc_write_commit_graph;
static int detach_auto = 1;
static timestamp_t gc_log_expire_time;
static const char *gc_log_expire = "1.day.ago";
git_config_get_int("gc.aggressivedepth", &aggressive_depth);
git_config_get_int("gc.auto", &gc_auto_threshold);
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
- git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph);
git_config_get_bool("gc.autodetach", &detach_auto);
git_config_get_expiry("gc.pruneexpire", &prune_expire);
git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
argv_array_push(&prune, prune_expire);
if (quiet)
argv_array_push(&prune, "--no-progress");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&prune,
"--exclude-promisor-objects");
if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
clean_pack_garbage();
}
- if (gc_write_commit_graph &&
- write_commit_graph_reachable(get_object_directory(),
- !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0))
- return 1;
+ prepare_repo_settings(the_repository);
+ if (the_repository->settings.gc_write_commit_graph == 1)
+ write_commit_graph_reachable(get_object_directory(),
+ !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
+ NULL);
if (auto_gc && too_many_loose_objects())
warning(_("There are too many unreachable loose objects; "
static int grep_submodule(struct grep_opt *opt,
const struct pathspec *pathspec,
const struct object_id *oid,
- const char *filename, const char *path)
+ const char *filename, const char *path, int cached)
{
struct repository subrepo;
struct repository *superproject = opt->repo;
object = parse_object_or_die(oid, oid_to_hex(oid));
grep_read_lock();
- data = read_object_with_reference(&object->oid, tree_type,
+ data = read_object_with_reference(&subrepo,
+ &object->oid, tree_type,
&size, NULL);
grep_read_unlock();
strbuf_release(&base);
free(data);
} else {
- hit = grep_cache(&subopt, pathspec, 1);
+ hit = grep_cache(&subopt, pathspec, cached);
}
repo_clear(&subrepo);
}
} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
submodule_path_match(repo->index, pathspec, name.buf, NULL)) {
- hit |= grep_submodule(opt, pathspec, NULL, ce->name, ce->name);
+ hit |= grep_submodule(opt, pathspec, NULL, ce->name,
+ ce->name, cached);
} else {
continue;
}
free(data);
} else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
hit |= grep_submodule(opt, pathspec, &entry.oid,
- base->buf, base->buf + tn_len);
+ base->buf, base->buf + tn_len,
+ 1); /* ignored */
}
strbuf_setlen(base, old_baselen);
int hit, len;
grep_read_lock();
- data = read_object_with_reference(&obj->oid, tree_type,
+ data = read_object_with_reference(opt->repo,
+ &obj->oid, tree_type,
&size, NULL);
grep_read_unlock();
strbuf_addf(&buf, "+/%s%s",
strcmp("less", pager) ? "" : "*",
opt.pattern_list->pattern);
- string_list_append(&path_list, buf.buf);
- strbuf_detach(&buf, NULL);
+ string_list_append(&path_list,
+ strbuf_detach(&buf, NULL));
}
}
int i;
const char *errstr = NULL;
- argc = parse_options(argc, argv, NULL, hash_object_options,
+ argc = parse_options(argc, argv, prefix, hash_object_options,
hash_object_usage, 0);
if (flags & HASH_WRITE_OBJECT)
#include "thread-utils.h"
#include "packfile.h"
#include "object-store.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
static const char index_pack_usage[] =
"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
sorted_by_pos[i] = &ref_deltas[i];
QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
- if (repository_format_partial_clone) {
+ if (has_promisor_remote()) {
/*
* Prefetch the delta bases.
*/
oid_array_append(&to_fetch, &d->oid);
}
if (to_fetch.nr)
- fetch_objects(repository_format_partial_clone,
- to_fetch.oid, to_fetch.nr);
+ promisor_remote_get_direct(the_repository,
+ to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}
static int default_show_signature;
static int decoration_style;
static int decoration_given;
-static int use_mailmap_config;
+static int use_mailmap_config = 1;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
struct string_list args;
};
+static int session_is_interactive(void)
+{
+ return isatty(1) || pager_in_use();
+}
+
static int auto_decoration_style(void)
{
- return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+ return session_is_interactive() ? DECORATE_SHORT_REFS : 0;
}
static int parse_decoration_style(const char *value)
struct rev_info *rev, struct setup_revision_opt *opt)
{
struct userformat_want w;
- int quiet = 0, source = 0, mailmap = 0;
+ int quiet = 0, source = 0, mailmap;
static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
static int git_format_config(const char *var, const char *value, void *cb)
{
+ struct rev_info *rev = cb;
+
if (!strcmp(var, "format.headers")) {
if (!value)
die(_("format.headers without value"));
from = NULL;
return 0;
}
+ if (!strcmp(var, "format.notes")) {
+ struct strbuf buf = STRBUF_INIT;
+ int b = git_parse_maybe_bool(value);
+ if (!b)
+ return 0;
+ rev->show_notes = 1;
+ if (b < 0) {
+ strbuf_addstr(&buf, value);
+ expand_notes_ref(&buf);
+ string_list_append(&rev->notes_opt.extra_notes_refs,
+ strbuf_detach(&buf, NULL));
+ } else {
+ rev->notes_opt.use_default_notes = 1;
+ }
+ return 0;
+ }
return git_log_config(var, value, cb);
}
struct object_id *patch_id;
if (*commit_base_at(&commit_base, commit))
continue;
- if (commit_patch_id(commit, &diffopt, &oid, 0))
+ if (commit_patch_id(commit, &diffopt, &oid, 0, 1))
die(_("cannot get patch id"));
ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
patch_id = bases->patch_id + bases->nr_patch_id;
extra_to.strdup_strings = 1;
extra_cc.strdup_strings = 1;
init_log_defaults();
- git_config(git_format_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
+ git_config(git_format_config, &rev);
rev.commit_format = CMIT_FMT_EMAIL;
rev.expand_tabs_in_log_default = 0;
rev.verbose_header = 1;
static char *traverse_path(const struct traverse_info *info, const struct name_entry *n)
{
- char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz);
- return make_traverse_path(path, info, n);
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_make_traverse_path(&buf, info, n->path, n->pathlen);
+ return strbuf_detach(&buf, NULL);
}
static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result)
static void unresolved_directory(const struct traverse_info *info,
struct name_entry n[3])
{
+ struct repository *r = the_repository;
char *newbase;
struct name_entry *p;
struct tree_desc t[3];
newbase = traverse_path(info, p);
#define ENTRY_OID(e) (((e)->mode && S_ISDIR((e)->mode)) ? &(e)->oid : NULL)
- buf0 = fill_tree_descriptor(t + 0, ENTRY_OID(n + 0));
- buf1 = fill_tree_descriptor(t + 1, ENTRY_OID(n + 1));
- buf2 = fill_tree_descriptor(t + 2, ENTRY_OID(n + 2));
+ buf0 = fill_tree_descriptor(r, t + 0, ENTRY_OID(n + 0));
+ buf1 = fill_tree_descriptor(r, t + 1, ENTRY_OID(n + 1));
+ buf2 = fill_tree_descriptor(r, t + 2, ENTRY_OID(n + 2));
#undef ENTRY_OID
merge_trees(t, newbase);
traverse_trees(&the_index, 3, t, &info);
}
-static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
+static void *get_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const char *rev)
{
struct object_id oid;
void *buf;
- if (get_oid(rev, &oid))
+ if (repo_get_oid(r, rev, &oid))
die("unknown rev %s", rev);
- buf = fill_tree_descriptor(desc, &oid);
+ buf = fill_tree_descriptor(r, desc, &oid);
if (!buf)
die("%s is not a tree", rev);
return buf;
int cmd_merge_tree(int argc, const char **argv, const char *prefix)
{
+ struct repository *r = the_repository;
struct tree_desc t[3];
void *buf1, *buf2, *buf3;
if (argc != 4)
usage(merge_tree_usage);
- buf1 = get_tree_descriptor(t+0, argv[1]);
- buf2 = get_tree_descriptor(t+1, argv[2]);
- buf3 = get_tree_descriptor(t+2, argv[3]);
+ buf1 = get_tree_descriptor(r, t+0, argv[1]);
+ buf2 = get_tree_descriptor(r, t+1, argv[2]);
+ buf3 = get_tree_descriptor(r, t+2, argv[3]);
merge_trees(t, "");
free(buf1);
free(buf2);
#include "packfile.h"
#include "tag.h"
#include "alias.h"
+#include "branch.h"
#include "commit-reach.h"
#include "wt-status.h"
static int verbosity;
static int allow_rerere_auto;
static int abort_current_merge;
+static int quit_current_merge;
static int continue_current_merge;
static int allow_unrelated_histories;
static int show_progress = -1;
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
-static int verify_msg = 1;
+static int no_verify;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
OPT__VERBOSITY(&verbosity),
OPT_BOOL(0, "abort", &abort_current_merge,
N_("abort the current in-progress merge")),
+ OPT_BOOL(0, "quit", &quit_current_merge,
+ N_("--abort but leave index and working tree alone")),
OPT_BOOL(0, "continue", &continue_current_merge,
N_("continue the current in-progress merge")),
OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories,
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
- OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
+ OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
OPT_END()
};
-/* Cleans up metadata that is uninteresting after a succeeded merge. */
-static void drop_save(void)
-{
- unlink(git_path_merge_head(the_repository));
- unlink(git_path_merge_msg(the_repository));
- unlink(git_path_merge_mode(the_repository));
-}
-
static int save_state(struct object_id *stash)
{
int len;
{
if (verbosity >= 0)
printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
- drop_save();
+ remove_merge_branch_state(the_repository);
}
static void squash_message(struct commit *commit, struct commit_list *remoteheads)
static void prepare_to_commit(struct commit_list *remoteheads)
{
struct strbuf msg = STRBUF_INIT;
+ const char *index_file = get_index_file();
+
+ if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL))
+ abort_commit(remoteheads, NULL);
+ /*
+ * Re-read the index as pre-merge-commit hook could have updated it,
+ * and write it out as a tree. We must do this before we invoke
+ * the editor and after we invoke run_status above.
+ */
+ if (find_hook("pre-merge-commit"))
+ discard_cache();
+ read_cache_from(index_file);
strbuf_addbuf(&msg, &merge_msg);
if (squash)
BUG("the control must not reach here under --squash");
abort_commit(remoteheads, NULL);
}
- if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
"commit-msg",
git_path_merge_msg(the_repository), NULL))
abort_commit(remoteheads, NULL);
&result_commit, NULL, sign_commit))
die(_("failed to write commit object"));
finish(head, remoteheads, &result_commit, "In-index merge");
- drop_save();
+ remove_merge_branch_state(the_repository);
return 0;
}
struct strbuf buf = STRBUF_INIT;
struct object_id result_commit;
+ write_tree_trivial(result_tree);
free_commit_list(common);
parents = remoteheads;
if (!head_subsumed || fast_forward == FF_NO)
strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
finish(head, remoteheads, &result_commit, buf.buf);
strbuf_release(&buf);
- drop_save();
+ remove_merge_branch_state(the_repository);
return 0;
}
goto done;
}
+ if (quit_current_merge) {
+ if (orig_argc != 2)
+ usage_msg_opt(_("--quit expects no arguments"),
+ builtin_merge_usage,
+ builtin_merge_options);
+
+ remove_merge_branch_state(the_repository);
+ goto done;
+ }
+
if (continue_current_merge) {
int nargc = 1;
const char *nargv[] = {"commit", NULL};
}
finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
- drop_save();
+ remove_merge_branch_state(the_repository);
goto done;
} else if (!remoteheads->next && common->next)
;
save_state(&stash))
oidclr(&stash);
- for (i = 0; i < use_strategies_nr; i++) {
- int ret;
+ for (i = 0; !merge_was_ok && i < use_strategies_nr; i++) {
+ int ret, cnt;
if (i) {
printf(_("Rewinding the tree to pristine...\n"));
restore_state(&head_commit->object.oid, &stash);
ret = try_merge_strategy(use_strategies[i]->name,
common, remoteheads,
head_commit);
- if (!option_commit && !ret) {
- merge_was_ok = 1;
- /*
- * This is necessary here just to avoid writing
- * the tree, but later we will *not* exit with
- * status code 1 because merge_was_ok is set.
- */
- ret = 1;
- }
-
- if (ret) {
- /*
- * The backend exits with 1 when conflicts are
- * left to be resolved, with 2 when it does not
- * handle the given merge at all.
- */
- if (ret == 1) {
- int cnt = evaluate_result();
-
- if (best_cnt <= 0 || cnt <= best_cnt) {
- best_strategy = use_strategies[i]->name;
- best_cnt = cnt;
+ /*
+ * The backend exits with 1 when conflicts are
+ * left to be resolved, with 2 when it does not
+ * handle the given merge at all.
+ */
+ if (ret < 2) {
+ if (!ret) {
+ if (option_commit) {
+ /* Automerge succeeded. */
+ automerge_was_ok = 1;
+ break;
}
+ merge_was_ok = 1;
+ }
+ cnt = evaluate_result();
+ if (best_cnt <= 0 || cnt <= best_cnt) {
+ best_strategy = use_strategies[i]->name;
+ best_cnt = cnt;
}
- if (merge_was_ok)
- break;
- else
- continue;
}
-
- /* Automerge succeeded. */
- write_tree_trivial(&result_tree);
- automerge_was_ok = 1;
- break;
}
/*
NULL
};
-static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_missing)
+static void mktree_line(char *buf, int nul_term_line, int allow_missing)
{
char *ptr, *ntr;
const char *p;
break;
die("input format error: (blank line only valid in batch mode)");
}
- mktree_line(sb.buf, sb.len, nul_term_line, allow_missing);
+ mktree_line(sb.buf, nul_term_line, allow_missing);
}
if (is_batch_mode && got_eof && used < 1) {
/*
#include "trace2.h"
static char const * const builtin_multi_pack_index_usage[] = {
- N_("git multi-pack-index [--object-dir=<dir>] (write|verify)"),
+ N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"),
NULL
};
static struct opts_multi_pack_index {
const char *object_dir;
+ unsigned long batch_size;
} opts;
int cmd_multi_pack_index(int argc, const char **argv,
static struct option builtin_multi_pack_index_options[] = {
OPT_FILENAME(0, "object-dir", &opts.object_dir,
N_("object directory containing set of packfile and pack-index pairs")),
+ OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
+ N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
OPT_END(),
};
trace2_cmd_mode(argv[0]);
+ if (!strcmp(argv[0], "repack"))
+ return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size);
+ if (opts.batch_size)
+ die(_("--batch-size option is only for 'repack' subcommand"));
+
if (!strcmp(argv[0], "write"))
return write_midx_file(opts.object_dir);
if (!strcmp(argv[0], "verify"))
return verify_midx_file(the_repository, opts.object_dir);
+ if (!strcmp(argv[0], "expire"))
+ return expire_midx_packs(the_repository, opts.object_dir);
- die(_("unrecognized verb: %s"), argv[0]);
+ die(_("unrecognized subcommand: %s"), argv[0]);
}
}
static int is_better_name(struct rev_name *name,
- const char *tip_name,
timestamp_t taggerdate,
- int generation,
int distance,
int from_tag)
{
name = xmalloc(sizeof(rev_name));
set_commit_rev_name(commit, name);
goto copy_data;
- } else if (is_better_name(name, tip_name, taggerdate,
- generation, distance, from_tag)) {
+ } else if (is_better_name(name, taggerdate, distance, from_tag)) {
copy_data:
name->tip_name = tip_name;
name->taggerdate = taggerdate;
*(p+1) = 0;
if (!get_oid(p - (hexsz - 1), &oid)) {
struct object *o =
- lookup_object(the_repository,
- oid.hash);
+ lookup_object(the_repository, &oid);
if (o)
name = get_rev_name(o, &buf);
}
static int use_bitmap_index_default = 1;
static int use_bitmap_index = -1;
-static int write_bitmap_index;
+static enum {
+ WRITE_BITMAP_FALSE = 0,
+ WRITE_BITMAP_QUIET,
+ WRITE_BITMAP_TRUE,
+} write_bitmap_index;
static uint16_t write_bitmap_options = BITMAP_OPT_HASH_CACHE;
static int exclude_promisor_objects;
void *cb_data)
{
struct object_id peeled;
- struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
+ struct object_entry *entry = packlist_find(&to_pack, oid, NULL);
if (entry)
entry->tagged = 1;
if (!peel_ref(path, &peeled)) {
- entry = packlist_find(&to_pack, peeled.hash, NULL);
+ entry = packlist_find(&to_pack, &peeled, NULL);
if (entry)
entry->tagged = 1;
}
nr_written, oid.hash, offset);
close(fd);
if (write_bitmap_index) {
- warning(_(no_split_warning));
+ if (write_bitmap_index != WRITE_BITMAP_QUIET)
+ warning(_(no_split_warning));
write_bitmap_index = 0;
}
}
{
struct object_entry *entry;
- entry = packlist_find(&to_pack, oid->hash, index_pos);
+ entry = packlist_find(&to_pack, oid, index_pos);
if (!entry)
return 0;
if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
/* The pack is missing an object, so it will not have closure */
if (write_bitmap_index) {
- warning(_(no_closure_warning));
+ if (write_bitmap_index != WRITE_BITMAP_QUIET)
+ warning(_(no_closure_warning));
write_bitmap_index = 0;
}
return 0;
if (window <= num_preferred_base++)
return;
- data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
+ data = read_object_with_reference(the_repository, oid,
+ tree_type, &size, &tree_oid);
if (!data)
return;
if (!base_sha1)
return 0;
+ oidread(&base_oid, base_sha1);
+
/*
* First see if we're already sending the base (or it's explicitly in
* our "excluded" list).
*/
- base = packlist_find(&to_pack, base_sha1, NULL);
+ base = packlist_find(&to_pack, &base_oid, NULL);
if (base) {
if (!in_same_island(&delta->idx.oid, &base->idx.oid))
return 0;
* even if it was buried too deep in history to make it into the
* packing list.
*/
- oidread(&base_oid, base_sha1);
if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) {
if (use_delta_islands) {
if (!in_same_island(&delta->idx.oid, &base_oid))
free(array);
}
-static void try_to_free_from_threads(size_t size)
-{
- packing_data_lock(&to_pack);
- release_pack_memory(size);
- packing_data_unlock(&to_pack);
-}
-
-static try_to_free_t old_try_to_free_routine;
-
/*
* The main object list is split into smaller lists, each is handed to
* one worker.
pthread_mutex_init(&cache_mutex, NULL);
pthread_mutex_init(&progress_mutex, NULL);
pthread_cond_init(&progress_cond, NULL);
- old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
}
static void cleanup_threaded_search(void)
{
- set_try_to_free_routine(old_try_to_free_routine);
pthread_cond_destroy(&progress_cond);
pthread_mutex_destroy(&cache_mutex);
pthread_mutex_destroy(&progress_mutex);
* it was included via bitmaps, we would not have parsed it
* previously).
*/
- if (packlist_find(&to_pack, oid->hash, NULL))
+ if (packlist_find(&to_pack, oid, NULL))
return;
tag = lookup_tag(the_repository, oid);
if (starts_with(path, "refs/tags/") && /* is a tag? */
!peel_ref(path, &peeled) && /* peelable? */
- packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */
+ packlist_find(&to_pack, &peeled, NULL)) /* object packed? */
add_tag_chain(oid);
return 0;
}
use_bitmap_index_default = git_config_bool(k, v);
return 0;
}
- if (!strcmp(k, "pack.usesparse")) {
- sparse = git_config_bool(k, v);
- return 0;
- }
if (!strcmp(k, "pack.threads")) {
delta_search_threads = git_config_int(k, v);
if (delta_search_threads < 0)
for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
depth++;
- ent = packlist_find(&to_pack, obj->oid.hash, NULL);
+ ent = packlist_find(&to_pack, &obj->oid, NULL);
if (ent && depth > oe_tree_depth(&to_pack, ent))
oe_set_tree_depth(&to_pack, ent, depth);
}
return oidcmp(&a->object->oid, &b->object->oid);
}
-static void add_objects_in_unpacked_packs(struct rev_info *revs)
+static void add_objects_in_unpacked_packs(void)
{
struct packed_git *p;
struct in_pack in_pack;
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
- o = lookup_unknown_object(oid.hash);
+ o = lookup_unknown_object(&oid);
if (!(o->flags & OBJECT_ADDED))
mark_in_pack_object(o, p, &in_pack);
o->flags |= OBJECT_ADDED;
return 1;
}
-static void loosen_unused_packed_objects(struct rev_info *revs)
+static void loosen_unused_packed_objects(void)
{
struct packed_git *p;
uint32_t i;
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
- if (!packlist_find(&to_pack, oid.hash, NULL) &&
+ if (!packlist_find(&to_pack, &oid, NULL) &&
!has_sha1_pack_kept_or_nonlocal(&oid) &&
!loosened_object_can_be_discarded(&oid, p->mtime))
if (force_object_loose(&oid, p->mtime))
}
if (keep_unreachable)
- add_objects_in_unpacked_packs(&revs);
+ add_objects_in_unpacked_packs();
if (pack_loose_unreachable)
add_unreachable_loose_objects();
if (unpack_unreachable)
- loosen_unused_packed_objects(&revs);
+ loosen_unused_packed_objects();
oid_array_clear(&recent_objects);
}
N_("do not hide commits by grafts"), 0),
OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
N_("use a bitmap index if available to speed up counting objects")),
- OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
- N_("write a bitmap index together with the pack index")),
+ OPT_SET_INT(0, "write-bitmap-index", &write_bitmap_index,
+ N_("write a bitmap index together with the pack index"),
+ WRITE_BITMAP_TRUE),
+ OPT_SET_INT_F(0, "write-bitmap-index-quiet",
+ &write_bitmap_index,
+ N_("write a bitmap index if possible"),
+ WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
{ OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
N_("handling for missing objects"), PARSE_OPT_NONEG,
read_replace_refs = 0;
sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
+ prepare_repo_settings(the_repository);
+ if (!sparse && the_repository->settings.pack_use_sparse != -1)
+ sparse = the_repository->settings.pack_use_sparse;
+
reset_pack_idx_option(&pack_idx_opts);
git_config(git_pack_config, NULL);
#include "builtin.h"
#include "config.h"
+#include "diff.h"
static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
{
return 1;
}
-static void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
-{
- unsigned char hash[GIT_MAX_RAWSZ];
- unsigned short carry = 0;
- int i;
-
- git_SHA1_Final(hash, ctx);
- git_SHA1_Init(ctx);
- /* 20-byte sum, with carry */
- for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
- carry += result->hash[i] + hash[i];
- result->hash[i] = carry;
- carry >>= 8;
- }
-}
-
static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
struct strbuf *line_buf, int stable)
{
perform_reachability_traversal(revs);
- obj = lookup_object(the_repository, oid->hash);
+ obj = lookup_object(the_repository, oid);
return obj && (obj->flags & SEEN);
}
static char *opt_refmap;
static char *opt_ipv4;
static char *opt_ipv6;
+static int opt_show_forced_updates = -1;
+static char *set_upstream;
static struct option pull_options[] = {
/* Shared options */
OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
N_("use IPv6 addresses only"),
PARSE_OPT_NOARG),
+ OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
+ N_("check for forced-updates on all updated branches")),
+ OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
+ N_("set upstream for git pull/fetch"),
+ PARSE_OPT_NOARG),
OPT_END()
};
argv_array_push(&args, opt_ipv4);
if (opt_ipv6)
argv_array_push(&args, opt_ipv6);
+ if (opt_show_forced_updates > 0)
+ argv_array_push(&args, "--show-forced-updates");
+ else if (opt_show_forced_updates == 0)
+ argv_array_push(&args, "--no-show-forced-updates");
+ if (set_upstream)
+ argv_array_push(&args, set_upstream);
if (repo) {
argv_array_push(&args, repo);
repo_diff_setup(the_repository, &diffopt);
options = parse_options_concat(range_diff_options, diffopt.parseopts);
- argc = parse_options(argc, argv, NULL, options,
+ argc = parse_options(argc, argv, prefix, options,
builtin_range_diff_usage, 0);
diff_setup_done(&diffopt);
return git_default_config(var, value, cb);
}
-int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
+int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
{
int i, stage = 0;
struct object_id oid;
git_config(git_read_tree_config, NULL);
- argc = parse_options(argc, argv, unused_prefix, read_tree_options,
+ argc = parse_options(argc, argv, cmd_prefix, read_tree_options,
read_tree_usage, 0);
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
const char *onto_name;
const char *revisions;
const char *switch_to;
- int root;
+ int root, root_with_onto;
struct object_id *squash_onto;
struct commit *restrict_revision;
int dont_finish_rebase;
flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
+ flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
switch (command) {
if (argc == 1)
usage_with_options(builtin_rebase_interactive_usage, options);
- argc = parse_options(argc, argv, NULL, options,
+ argc = parse_options(argc, argv, prefix, options,
builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
if (!is_null_oid(&squash_onto))
goto leave_reset_head;
}
- if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {
+ if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
ret = error(_("failed to find tree of %s"),
oid_to_hex(&head_oid));
goto leave_reset_head;
}
- if (!fill_tree_descriptor(&desc[nr++], oid)) {
+ if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
goto leave_reset_head;
}
}
switch (opts->type) {
- case REBASE_AM:
- backend = "git-rebase--am";
- backend_func = "git_rebase__am";
- break;
case REBASE_PRESERVE_MERGES:
backend = "git-rebase--preserve-merges";
backend_func = "git_rebase__preserve_merges";
}
strbuf_addf(&script_snippet,
- ". git-sh-setup && . git-rebase--common &&"
- " . %s && %s", backend, backend_func);
+ ". git-sh-setup && . %s && %s", backend, backend_func);
argv[0] = script_snippet.buf;
status = run_command_v_opt(argv, RUN_USING_SHELL);
usage_with_options(builtin_rebase_usage,
builtin_rebase_options);
- prefix = setup_git_directory();
- trace_repo_setup(prefix);
- setup_work_tree();
-
options.allow_empty_message = 1;
git_config(rebase_config, &options);
if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD,
NULL, NULL) < 0)
die(_("could not discard worktree changes"));
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
if (read_basic_state(&options))
exit(1);
goto run_rebase;
NULL, NULL) < 0)
die(_("could not move back to %s"),
oid_to_hex(&options.orig_head));
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
ret = !!finish_rebase(&options);
goto cleanup;
}
"'--reschedule-failed-exec'"));
}
- if (options.rebase_merges) {
- if (strategy_options.nr)
- die(_("cannot combine '--rebase-merges' with "
- "'--strategy-option'"));
- if (options.strategy)
- die(_("cannot combine '--rebase-merges' with "
- "'--strategy'"));
- }
-
if (!options.root) {
if (argc < 1) {
struct branch *branch;
options.squash_onto = &squash_onto;
options.onto_name = squash_onto_name =
xstrdup(oid_to_hex(&squash_onto));
- }
+ } else
+ options.root_with_onto = 1;
+
options.upstream_name = NULL;
options.upstream = NULL;
if (argc > 1)
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL,
- RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_DETACH | RESET_ORIG_HEAD |
RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, msg.buf))
die(_("Could not detach HEAD"));
#include "object.h"
#include "remote.h"
#include "connect.h"
-#include "transport.h"
#include "string-list.h"
#include "sha1-array.h"
#include "connected.h"
return ret;
}
-static void prepare_shallow_update(struct command *commands,
- struct shallow_info *si)
+static void prepare_shallow_update(struct shallow_info *si)
{
int i, j, k, bitmap_size = DIV_ROUND_UP(si->ref->nr, 32);
si->ref = ref;
if (shallow_update) {
- prepare_shallow_update(commands, si);
+ prepare_shallow_update(si);
return;
}
return retval;
}
-static int remove_all_fetch_refspecs(const char *remote, const char *key)
+static int remove_all_fetch_refspecs(const char *key)
{
return git_config_set_multivar_gently(key, NULL, NULL, 1);
}
if (!remote_is_configured(remote, 1))
die(_("No such remote '%s'"), remotename);
- if (!add_mode && remove_all_fetch_refspecs(remotename, key.buf)) {
+ if (!add_mode && remove_all_fetch_refspecs(key.buf)) {
strbuf_release(&key);
return 1;
}
#include "midx.h"
#include "packfile.h"
#include "object-store.h"
+#include "promisor-remote.h"
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
static void remove_redundant_pack(const char *dir_name, const char *base_name)
{
- const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
- int i;
struct strbuf buf = STRBUF_INIT;
- size_t plen;
-
- strbuf_addf(&buf, "%s/%s", dir_name, base_name);
- plen = buf.len;
-
- for (i = 0; i < ARRAY_SIZE(exts); i++) {
- strbuf_setlen(&buf, plen);
- strbuf_addstr(&buf, exts[i]);
- unlink(buf.buf);
- }
+ strbuf_addf(&buf, "%s/%s.pack", dir_name, base_name);
+ unlink_pack_path(buf.buf, 1);
strbuf_release(&buf);
}
(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
die(_("--keep-unreachable and -A are incompatible"));
- if (write_bitmaps < 0)
- write_bitmaps = (pack_everything & ALL_INTO_ONE) &&
- is_bare_repository();
+ if (write_bitmaps < 0) {
+ if (!(pack_everything & ALL_INTO_ONE) ||
+ !is_bare_repository())
+ write_bitmaps = 0;
+ }
if (pack_kept_objects < 0)
- pack_kept_objects = write_bitmaps;
+ pack_kept_objects = write_bitmaps > 0;
if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
die(_(incremental_bitmap_conflict_error));
argv_array_push(&cmd.args, "--all");
argv_array_push(&cmd.args, "--reflog");
argv_array_push(&cmd.args, "--indexed-objects");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&cmd.args, "--exclude-promisor-objects");
- if (write_bitmaps)
+ if (write_bitmaps > 0)
argv_array_push(&cmd.args, "--write-bitmap-index");
+ else if (write_bitmaps < 0)
+ argv_array_push(&cmd.args, "--write-bitmap-index-quiet");
if (use_delta_islands)
argv_array_push(&cmd.args, "--delta-islands");
struct object_id head_oid;
if (get_oid("HEAD", &head_oid))
return error(_("You do not have a valid HEAD."));
- if (!fill_tree_descriptor(desc + nr, &head_oid))
+ if (!fill_tree_descriptor(the_repository, desc + nr, &head_oid))
return error(_("Failed to find tree of HEAD."));
nr++;
opts.fn = twoway_merge;
}
- if (!fill_tree_descriptor(desc + nr, oid)) {
+ if (!fill_tree_descriptor(the_repository, desc + nr, oid)) {
error(_("Failed to find tree of %s."), oid_to_hex(oid));
goto out;
}
print_new_head_line(lookup_commit_reference(the_repository, &oid));
}
if (!pathspec.nr)
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return update_ref_status;
}
" --objects | --objects-edge\n"
" --unpacked\n"
" --header | --pretty\n"
+" --[no-]object-names\n"
" --abbrev=<n> | --no-abbrev\n"
" --abbrev-commit\n"
" --left-right\n"
};
static enum missing_action arg_missing_action;
+/* display only the oid of each object encountered */
+static int arg_show_object_names = 1;
+
#define DEFAULT_OIDSET_SIZE (16*1024)
-static void finish_commit(struct commit *commit, void *data);
+static void finish_commit(struct commit *commit);
static void show_commit(struct commit *commit, void *data)
{
struct rev_list_info *info = data;
display_progress(progress, ++progress_counter);
if (info->flags & REV_LIST_QUIET) {
- finish_commit(commit, data);
+ finish_commit(commit);
return;
}
revs->count_left++;
else
revs->count_right++;
- finish_commit(commit, data);
+ finish_commit(commit);
return;
}
putchar('\n');
}
maybe_flush_or_die(stdout, "stdout");
- finish_commit(commit, data);
+ finish_commit(commit);
}
-static void finish_commit(struct commit *commit, void *data)
+static void finish_commit(struct commit *commit)
{
if (commit->parents) {
free_commit_list(commit->parents);
display_progress(progress, ++progress_counter);
if (info->flags & REV_LIST_QUIET)
return;
- show_object_with_name(stdout, obj, name);
+ if (arg_show_object_names)
+ show_object_with_name(stdout, obj, name);
+ else
+ printf("%s\n", oid_to_hex(&obj->oid));
}
static void show_edge(struct commit *commit)
die(_("object filtering requires --objects"));
if (filter_options.choice == LOFC_SPARSE_OID &&
!filter_options.sparse_oid_value)
- die(_("invalid sparse value '%s'"),
- filter_options.filter_spec);
+ die(
+ _("invalid sparse value '%s'"),
+ list_objects_filter_spec(
+ &filter_options));
continue;
}
if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
if (skip_prefix(arg, "--missing=", &arg))
continue; /* already handled above */
+ if (!strcmp(arg, ("--no-object-names"))) {
+ arg_show_object_names = 0;
+ continue;
+ }
+
+ if (!strcmp(arg, ("--object-names"))) {
+ arg_show_object_names = 1;
+ continue;
+ }
+
usage(rev_list_usage);
}
OPT_CMDMODE(0, "quit", &cmd, N_("end revert or cherry-pick sequence"), 'q'),
OPT_CMDMODE(0, "continue", &cmd, N_("resume revert or cherry-pick sequence"), 'c'),
OPT_CMDMODE(0, "abort", &cmd, N_("cancel revert or cherry-pick sequence"), 'a'),
+ OPT_CMDMODE(0, "skip", &cmd, N_("skip current commit and continue"), 's'),
OPT_CLEANUP(&cleanup_arg),
OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit message")),
this_operation = "--quit";
else if (cmd == 'c')
this_operation = "--continue";
+ else if (cmd == 's')
+ this_operation = "--skip";
else {
assert(cmd == 'a');
this_operation = "--abort";
if (cmd == 'q') {
int ret = sequencer_remove_state(opts);
if (!ret)
- remove_branch_state(the_repository);
+ remove_branch_state(the_repository, 0);
return ret;
}
if (cmd == 'c')
return sequencer_continue(the_repository, opts);
if (cmd == 'a')
return sequencer_rollback(the_repository, opts);
+ if (cmd == 's')
+ return sequencer_skip(the_repository, opts);
return sequencer_pick_revisions(the_repository, opts);
}
}
}
-static void submodules_absorb_gitdir_if_needed(const char *prefix)
+static void submodules_absorb_gitdir_if_needed(void)
{
int i;
for (i = 0; i < list.nr; i++) {
continue;
if (!submodule_uses_gitfile(name))
- absorb_git_dir_into_superproject(prefix, name,
+ absorb_git_dir_into_superproject(name,
ABSORB_GITDIR_RECURSE_SUBMODULES);
}
}
* way as changed from the HEAD.
*/
if (no_head
- || get_tree_entry(head, name, &oid, &mode)
+ || get_tree_entry(the_repository, head, name, &oid, &mode)
|| ce->ce_mode != create_ce_mode(mode)
|| !oideq(&ce->oid, &oid))
staged_changes = 1;
}
if (!index_only)
- submodules_absorb_gitdir_if_needed(prefix);
+ submodules_absorb_gitdir_if_needed();
/*
* If not forced, the file, the index and the HEAD (if exists)
static int show_independent(struct commit **rev,
int num_rev,
- char **ref_name,
unsigned int *rev_mask)
{
int i;
return show_merge_base(seen, num_rev);
if (independent)
- return show_independent(rev, num_rev, ref_name, rev_mask);
+ return show_independent(rev, num_rev, rev_mask);
/* Show list; --more=-1 means list-only */
if (1 < num_rev || extra < 0) {
}
if (keep_index == 1 && !is_null_oid(&info.i_tree)) {
- struct child_process cp_ls = CHILD_PROCESS_INIT;
- struct child_process cp_checkout = CHILD_PROCESS_INIT;
- struct strbuf out = STRBUF_INIT;
-
- if (reset_tree(&info.i_tree, 0, 1)) {
- ret = -1;
- goto done;
- }
-
- cp_ls.git_cmd = 1;
- argv_array_pushl(&cp_ls.args, "ls-files", "-z",
- "--modified", "--", NULL);
-
- add_pathspecs(&cp_ls.args, ps);
- if (pipe_command(&cp_ls, NULL, 0, &out, 0, NULL, 0)) {
- ret = -1;
- goto done;
- }
+ struct child_process cp = CHILD_PROCESS_INIT;
- cp_checkout.git_cmd = 1;
- argv_array_pushl(&cp_checkout.args, "checkout-index",
- "-z", "--force", "--stdin", NULL);
- if (pipe_command(&cp_checkout, out.buf, out.len, NULL,
- 0, NULL, 0)) {
+ cp.git_cmd = 1;
+ argv_array_pushl(&cp.args, "checkout", "--no-overlay",
+ oid_to_hex(&info.i_tree), "--", NULL);
+ if (!ps->nr)
+ argv_array_push(&cp.args, ":/");
+ else
+ add_pathspecs(&cp.args, ps);
+ if (run_command(&cp)) {
ret = -1;
goto done;
}
return 1;
for (i = 0; i < list.nr; i++)
- absorb_git_dir_into_superproject(prefix,
- list.entries[i]->name, flags);
+ absorb_git_dir_into_superproject(list.entries[i]->name, flags);
return 0;
}
static unsigned int colopts;
static int force_sign_annotate;
+static int config_sign_tag = -1; /* unspecified */
static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,
struct ref_format *format)
int status;
struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
+ if (!strcmp(var, "tag.gpgsign")) {
+ config_sign_tag = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "tag.sort")) {
if (!value)
return config_error_nonbool(var);
memset(&opt, 0, sizeof(opt));
memset(&filter, 0, sizeof(filter));
filter.lines = -1;
+ opt.sign = -1;
argc = parse_options(argc, argv, prefix, options, git_tag_usage, 0);
- if (keyid) {
- opt.sign = 1;
- set_signing_key(keyid);
- }
- create_tag_object = (opt.sign || annotate || msg.given || msgfile);
-
if (!cmdmode) {
if (argc == 0)
cmdmode = 'l';
if (cmdmode == 'l')
setup_auto_pager("tag", 1);
+ if (opt.sign == -1)
+ opt.sign = cmdmode ? 0 : config_sign_tag > 0;
+
+ if (keyid) {
+ opt.sign = 1;
+ set_signing_key(keyid);
+ }
+ create_tag_object = (opt.sign || annotate || msg.given || msgfile);
+
if ((create_tag_object || force) && (cmdmode != 0))
usage_with_options(git_tag_usage, options);
{
struct object *obj;
struct obj_buffer *obj_buffer;
- obj = lookup_object(the_repository, base->hash);
+ obj = lookup_object(the_repository, base);
if (!obj)
return 0;
obj_buffer = lookup_object_buffer(obj);
struct object_id oid;
struct cache_entry *ce;
- if (get_tree_entry(ent, path, &oid, &mode)) {
+ if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
if (which)
error("%s: not in %s branch.", path, which);
return NULL;
struct parse_opt_ctx_t ctx;
strbuf_getline_fn getline_fn;
int parseopt_state = PARSE_OPT_UNKNOWN;
+ struct repository *r = the_repository;
struct option options[] = {
OPT_BIT('q', NULL, &refresh_args.flags,
N_("continue refresh even when index needs update"),
remove_split_index(&the_index);
}
+ prepare_repo_settings(r);
switch (untracked_cache) {
case UC_UNSPECIFIED:
break;
case UC_DISABLE:
- if (git_config_get_untracked_cache() == 1)
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
warning(_("core.untrackedCache is set to true; "
"remove or change it, if you really want to "
"disable the untracked cache"));
return !test_if_untracked_cache_is_supported();
case UC_ENABLE:
case UC_FORCE:
- if (git_config_get_untracked_cache() == 0)
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)
warning(_("core.untrackedCache is set to false; "
"remove or change it, if you really want to "
"enable the untracked cache"));
packet_trace_identity("upload-pack");
read_replace_refs = 0;
- argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, upload_pack_usage, 0);
if (argc != 1)
usage_with_options(upload_pack_usage, options);
NULL
};
-static int run_gpg_verify(const struct object_id *oid, const char *buf, unsigned long size, unsigned flags)
+static int run_gpg_verify(struct commit *commit, unsigned flags)
{
struct signature_check signature_check;
int ret;
memset(&signature_check, 0, sizeof(signature_check));
- ret = check_commit_signature(lookup_commit(the_repository, oid),
- &signature_check);
+ ret = check_commit_signature(commit, &signature_check);
print_signature_buffer(&signature_check, flags);
signature_check_clear(&signature_check);
static int verify_commit(const char *name, unsigned flags)
{
- enum object_type type;
struct object_id oid;
- char *buf;
- unsigned long size;
- int ret;
+ struct object *obj;
if (get_oid(name, &oid))
return error("commit '%s' not found.", name);
- buf = read_object_file(&oid, &type, &size);
- if (!buf)
+ obj = parse_object(the_repository, &oid);
+ if (!obj)
return error("%s: unable to read file.", name);
- if (type != OBJ_COMMIT)
+ if (obj->type != OBJ_COMMIT)
return error("%s: cannot verify a non-commit object of type %s.",
- name, type_name(type));
-
- ret = run_gpg_verify(&oid, buf, size, flags);
+ name, type_name(obj->type));
- free(buf);
- return ret;
+ return run_gpg_verify((struct commit *)obj, flags);
}
static int git_verify_commit_config(const char *var, const char *value, void *cb)
struct strbuf symref = STRBUF_INIT;
struct commit *commit = NULL;
int is_branch = 0;
+ struct strbuf sb_name = STRBUF_INIT;
validate_worktree_add(path, opts);
die(_("invalid reference: %s"), refname);
name = worktree_basename(path, &len);
- git_path_buf(&sb_repo, "worktrees/%.*s", (int)(path + len - name), name);
+ strbuf_add(&sb, name, path + len - name);
+ sanitize_refname_component(sb.buf, &sb_name);
+ if (!sb_name.len)
+ BUG("How come '%s' becomes empty after sanitization?", sb.buf);
+ strbuf_reset(&sb);
+ name = sb_name.buf;
+ git_path_buf(&sb_repo, "worktrees/%s", name);
len = sb_repo.len;
if (safe_create_leading_directories_const(sb_repo.buf))
die_errno(_("could not create leading directories of '%s'"),
strbuf_release(&symref);
strbuf_release(&sb_repo);
strbuf_release(&sb_git);
+ strbuf_release(&sb_name);
return ret;
}
original_path);
ret = xread(cp.out, buf, sizeof(buf));
if (ret)
- die(_("'%s' is dirty, use --force to delete it"),
+ die(_("'%s' contains modified or untracked files, use --force to delete it"),
original_path);
close(cp.out);
ret = finish_command(&cp);
NULL
};
-int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
+int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)
{
int flags = 0, ret;
- const char *prefix = NULL;
+ const char *tree_prefix = NULL;
struct object_id oid;
const char *me = "git-write-tree";
struct option write_tree_options[] = {
OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"),
WRITE_TREE_MISSING_OK),
- OPT_STRING(0, "prefix", &prefix, N_("<prefix>/"),
+ OPT_STRING(0, "prefix", &
tree_prefix, N_("<prefix>/"),
N_("write tree object for a subdirectory <prefix>")),
{ OPTION_BIT, 0, "ignore-cache-tree", &flags, NULL,
N_("only useful for debugging"),
};
git_config(git_default_config, NULL);
- argc = parse_options(argc, argv, unused_prefix, write_tree_options,
+ argc = parse_options(argc, argv, cmd_prefix, write_tree_options,
write_tree_usage, 0);
- ret = write_cache_as_tree(&oid, flags, prefix);
+ ret = write_cache_as_tree(&oid, flags, tree_prefix);
switch (ret) {
case 0:
printf("%s\n", oid_to_hex(&oid));
die("%s: error building trees", me);
break;
case WRITE_TREE_PREFIX_ERROR:
- die("%s: prefix %s not found", me, prefix);
+ die("%s: prefix %s not found", me, tree_prefix);
break;
}
return ret;
#include "cache-tree.h"
#include "object-store.h"
#include "replace-object.h"
+#include "promisor-remote.h"
-#ifndef DEBUG
-#define DEBUG 0
+#ifndef DEBUG_CACHE_TREE
+#define DEBUG_CACHE_TREE 0
#endif
struct cache_tree *cache_tree(void)
int namelen;
struct cache_tree_sub *down;
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif
}
ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
- (repository_format_partial_clone &&
+ (has_promisor_remote() &&
ce_skip_worktree(ce));
if (is_null_oid(oid) ||
(!ce_missing_ok && !has_object_file(oid))) {
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one %o %.*s\n",
mode, entlen, path + baselen);
#endif
strbuf_release(&buffer);
it->entry_count = to_invalidate ? -1 : i - *skip_count;
-#if DEBUG
+#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
it->entry_count, it->subtree_nr,
oid_to_hex(&it->oid));
strbuf_add(buffer, path, pathlen);
strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
-#if DEBUG
+#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
pathlen, path, it->entry_count, it->subtree_nr,
size -= rawsz;
}
-#if DEBUG
+#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
*buffer, it->entry_count, subtree_nr,
if (!info->prev)
return root;
our_parent = find_cache_tree_from_traversal(root, info->prev);
- return cache_tree_find(our_parent, info->name.path);
+ return cache_tree_find(our_parent, info->name);
}
int cache_tree_matches_traversal(struct cache_tree *root,
int git_deflate(git_zstream *, int flush);
unsigned long git_deflate_bound(git_zstream *, unsigned long);
-/* The length in bytes and in hex digits of an object name (SHA-1 value). */
-#define GIT_SHA1_RAWSZ 20
-#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
-/* The block size of SHA-1. */
-#define GIT_SHA1_BLKSZ 64
-
-/* The length in bytes and in hex digits of an object name (SHA-256 value). */
-#define GIT_SHA256_RAWSZ 32
-#define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
-/* The block size of SHA-256. */
-#define GIT_SHA256_BLKSZ 64
-
-/* The length in byte and in hex digits of the largest possible hash value. */
-#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
-#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
-/* The largest possible block size for any supported hash. */
-#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
-
-struct object_id {
- unsigned char hash[GIT_MAX_RAWSZ];
-};
-
-#define the_hash_algo the_repository->hash_algo
-
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
#define DTYPE(de) ((de)->d_type)
#else
* at least 'nr' entries; the number of entries currently allocated
* is 'alloc', using the standard growing factor alloc_nr() macro.
*
+ * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some
+ * added niceties.
+ *
* DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'.
*/
#define ALLOC_GROW(x, nr, alloc) \
} \
} while (0)
+/*
+ * Similar to ALLOC_GROW but handles updating of the nr value and
+ * zeroing the bytes of the newly-grown array elements.
+ *
+ * DO NOT USE any expression with side-effect for any of the
+ * arguments.
+ */
+#define ALLOC_GROW_BY(x, nr, increase, alloc) \
+ do { \
+ if (increase) { \
+ size_t new_nr = nr + (increase); \
+ if (new_nr < nr) \
+ BUG("negative growth in ALLOC_GROW_BY"); \
+ ALLOC_GROW(x, new_nr, alloc); \
+ memset((x) + nr, 0, sizeof(*(x)) * (increase)); \
+ nr = new_nr; \
+ } \
+ } while (0)
+
/* Initialize and use the cache information */
struct lock_file;
void preload_index(struct index_state *index,
#define GIT_REPO_VERSION 0
#define GIT_REPO_VERSION_READ 1
extern int repository_format_precious_objects;
-extern char *repository_format_partial_clone;
-extern const char *core_partial_clone_filter_default;
extern int repository_format_worktree_config;
/*
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
-void *read_object_with_reference(const struct object_id *oid,
+void *read_object_with_reference(struct repository *r,
+ const struct object_id *oid,
const char *required_type,
unsigned long *size,
struct object_id *oid_ret);
extern int diff_auto_refresh_index;
/* match-trees.c */
-void shift_tree(const struct object_id *, const struct object_id *, struct object_id *, int);
-void shift_tree_by(const struct object_id *, const struct object_id *, struct object_id *, const char *);
+void shift_tree(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, int);
+void shift_tree_by(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, const char *);
/*
* whitespace rules.
export GIT_SKIP_TESTS="t9810 t9816"
;;
GIT_TEST_GETTEXT_POISON)
- export GIT_TEST_GETTEXT_POISON=YesPlease
+ export GIT_TEST_GETTEXT_POISON=true
;;
esac
esac
make
-make test
-if test "$jobname" = "linux-gcc"
-then
+case "$jobname" in
+linux-gcc)
+ make test
export GIT_TEST_SPLIT_INDEX=yes
export GIT_TEST_FULL_IN_PACK_ARRAY=true
export GIT_TEST_OE_SIZE=10
export GIT_TEST_COMMIT_GRAPH=1
export GIT_TEST_MULTI_PACK_INDEX=1
make test
-fi
+ ;;
+linux-gcc-4.8)
+ # Don't run the tests; we only care about whether Git can be
+ # built with GCC 4.8, as it errors out on some undesired (C99)
+ # constructs that newer compilers seem to quietly accept.
+ ;;
+*)
+ make test
+ ;;
+esac
check_unignored_build_artifacts
git-check-attr purehelpers
git-check-ignore purehelpers
git-check-mailmap purehelpers
-git-checkout mainporcelain history
+git-checkout mainporcelain
git-checkout-index plumbingmanipulators
git-check-ref-format purehelpers
git-cherry plumbinginterrogators complete
git-cvsserver foreignscminterface
git-daemon synchingrepositories
git-describe mainporcelain
-git-diff mainporcelain history
+git-diff mainporcelain info
git-diff-files plumbinginterrogators
git-diff-index plumbinginterrogators
git-diff-tree plumbinginterrogators
git-replace ancillarymanipulators complete
git-request-pull foreignscminterface complete
git-rerere ancillaryinterrogators
-git-reset mainporcelain worktree
+git-reset mainporcelain history
+git-restore mainporcelain worktree
git-revert mainporcelain
git-rev-list plumbinginterrogators
git-rev-parse plumbinginterrogators
git-stripspace purehelpers
git-submodule mainporcelain
git-svn foreignscminterface
+git-switch mainporcelain history
git-symbolic-ref plumbingmanipulators
git-tag mainporcelain history
git-unpack-file plumbinginterrogators
#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
#define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
+#define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
#define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
char *get_commit_graph_filename(const char *obj_dir)
{
- return xstrfmt("%s/info/commit-graph", obj_dir);
+ char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
+ char *normalized = xmalloc(strlen(filename) + 1);
+ normalize_path_copy(normalized, filename);
+ free(filename);
+ return normalized;
+}
+
+static char *get_split_graph_filename(const char *obj_dir,
+ const char *oid_hex)
+{
+ char *filename = xstrfmt("%s/info/commit-graphs/graph-%s.graph",
+ obj_dir,
+ oid_hex);
+ char *normalized = xmalloc(strlen(filename) + 1);
+ normalize_path_copy(normalized, filename);
+ free(filename);
+ return normalized;
+}
+
+static char *get_chain_filename(const char *obj_dir)
+{
+ return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir);
}
static uint8_t oid_version(void)
else
graph->chunk_extra_edges = data + chunk_offset;
break;
+
+ case GRAPH_CHUNKID_BASE:
+ if (graph->chunk_base_graphs)
+ chunk_repeated = 1;
+ else
+ graph->chunk_base_graphs = data + chunk_offset;
}
if (chunk_repeated) {
last_chunk_offset = chunk_offset;
}
+ hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
+
if (verify_commit_graph_lite(graph)) {
free(graph);
return NULL;
struct stat st;
int fd;
+ struct commit_graph *g;
int open_ok = open_commit_graph(graph_file, &fd, &st);
if (!open_ok)
return NULL;
- return load_commit_graph_one_fd_st(fd, &st);
+ g = load_commit_graph_one_fd_st(fd, &st);
+
+ if (g)
+ g->filename = xstrdup(graph_file);
+
+ return g;
+}
+
+static struct commit_graph *load_commit_graph_v1(struct repository *r, const char *obj_dir)
+{
+ char *graph_name = get_commit_graph_filename(obj_dir);
+ struct commit_graph *g = load_commit_graph_one(graph_name);
+ free(graph_name);
+
+ if (g)
+ g->obj_dir = obj_dir;
+
+ return g;
+}
+
+static int add_graph_to_chain(struct commit_graph *g,
+ struct commit_graph *chain,
+ struct object_id *oids,
+ int n)
+{
+ struct commit_graph *cur_g = chain;
+
+ if (n && !g->chunk_base_graphs) {
+ warning(_("commit-graph has no base graphs chunk"));
+ return 0;
+ }
+
+ while (n) {
+ n--;
+
+ if (!cur_g ||
+ !oideq(&oids[n], &cur_g->oid) ||
+ !hasheq(oids[n].hash, g->chunk_base_graphs + g->hash_len * n)) {
+ warning(_("commit-graph chain does not match"));
+ return 0;
+ }
+
+ cur_g = cur_g->base_graph;
+ }
+
+ g->base_graph = chain;
+
+ if (chain)
+ g->num_commits_in_base = chain->num_commits + chain->num_commits_in_base;
+
+ return 1;
+}
+
+static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir)
+{
+ struct commit_graph *graph_chain = NULL;
+ struct strbuf line = STRBUF_INIT;
+ struct stat st;
+ struct object_id *oids;
+ int i = 0, valid = 1, count;
+ char *chain_name = get_chain_filename(obj_dir);
+ FILE *fp;
+ int stat_res;
+
+ fp = fopen(chain_name, "r");
+ stat_res = stat(chain_name, &st);
+ free(chain_name);
+
+ if (!fp ||
+ stat_res ||
+ st.st_size <= the_hash_algo->hexsz)
+ return NULL;
+
+ count = st.st_size / (the_hash_algo->hexsz + 1);
+ oids = xcalloc(count, sizeof(struct object_id));
+
+ prepare_alt_odb(r);
+
+ for (i = 0; i < count; i++) {
+ struct object_directory *odb;
+
+ if (strbuf_getline_lf(&line, fp) == EOF)
+ break;
+
+ if (get_oid_hex(line.buf, &oids[i])) {
+ warning(_("invalid commit-graph chain: line '%s' not a hash"),
+ line.buf);
+ valid = 0;
+ break;
+ }
+
+ valid = 0;
+ for (odb = r->objects->odb; odb; odb = odb->next) {
+ char *graph_name = get_split_graph_filename(odb->path, line.buf);
+ struct commit_graph *g = load_commit_graph_one(graph_name);
+
+ free(graph_name);
+
+ if (g) {
+ g->obj_dir = odb->path;
+
+ if (add_graph_to_chain(g, graph_chain, oids, i)) {
+ graph_chain = g;
+ valid = 1;
+ }
+
+ break;
+ }
+ }
+
+ if (!valid) {
+ warning(_("unable to find all commit-graph files"));
+ break;
+ }
+ }
+
+ free(oids);
+ fclose(fp);
+ strbuf_release(&line);
+
+ return graph_chain;
+}
+
+struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir)
+{
+ struct commit_graph *g = load_commit_graph_v1(r, obj_dir);
+
+ if (!g)
+ g = load_commit_graph_chain(r, obj_dir);
+
+ return g;
}
static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
{
- char *graph_name;
if (r->objects->commit_graph)
return;
- graph_name = get_commit_graph_filename(obj_dir);
- r->objects->commit_graph =
- load_commit_graph_one(graph_name);
-
- FREE_AND_NULL(graph_name);
+ r->objects->commit_graph = read_commit_graph_one(r, obj_dir);
}
/*
static int prepare_commit_graph(struct repository *r)
{
struct object_directory *odb;
- int config_value;
if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
die("dying as requested by the '%s' variable on commit-graph load!",
return !!r->objects->commit_graph;
r->objects->commit_graph_attempted = 1;
+ prepare_repo_settings(r);
+
if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
- (repo_config_get_bool(r, "core.commitgraph", &config_value) ||
- !config_value))
+ r->settings.core_commit_graph != 1)
/*
* This repository is not configured to use commit graphs, so
* do not load one. (But report commit_graph_attempted anyway
return !!first_generation;
}
+static void close_commit_graph_one(struct commit_graph *g)
+{
+ if (!g)
+ return;
+
+ close_commit_graph_one(g->base_graph);
+ free_commit_graph(g);
+}
+
void close_commit_graph(struct raw_object_store *o)
{
- free_commit_graph(o->commit_graph);
+ close_commit_graph_one(o->commit_graph);
o->commit_graph = NULL;
}
g->chunk_oid_lookup, g->hash_len, pos);
}
+static void load_oid_from_graph(struct commit_graph *g,
+ uint32_t pos,
+ struct object_id *oid)
+{
+ uint32_t lex_index;
+
+ while (g && pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ if (!g)
+ BUG("NULL commit-graph");
+
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die(_("invalid commit position. commit-graph is likely corrupt"));
+
+ lex_index = pos - g->num_commits_in_base;
+
+ hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * lex_index);
+}
+
static struct commit_list **insert_parent_or_die(struct repository *r,
struct commit_graph *g,
- uint64_t pos,
+ uint32_t pos,
struct commit_list **pptr)
{
struct commit *c;
struct object_id oid;
- if (pos >= g->num_commits)
- die("invalid parent position %"PRIu64, pos);
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die("invalid parent position %"PRIu32, pos);
- hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * pos);
+ load_oid_from_graph(g, pos, &oid);
c = lookup_commit(r, &oid);
if (!c)
die(_("could not find commit %s"), oid_to_hex(&oid));
static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos)
{
- const unsigned char *commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * pos;
+ const unsigned char *commit_data;
+ uint32_t lex_index;
+
+ while (pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ lex_index = pos - g->num_commits_in_base;
+ commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * lex_index;
item->graph_pos = pos;
item->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
}
uint32_t *parent_data_ptr;
uint64_t date_low, date_high;
struct commit_list **pptr;
- const unsigned char *commit_data = g->chunk_commit_data + (g->hash_len + 16) * pos;
+ const unsigned char *commit_data;
+ uint32_t lex_index;
- item->object.parsed = 1;
+ while (pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die(_("invalid commit position. commit-graph is likely corrupt"));
+
+ /*
+ * Store the "full" position, but then use the
+ * "local" position for the rest of the calculation.
+ */
item->graph_pos = pos;
+ lex_index = pos - g->num_commits_in_base;
+
+ commit_data = g->chunk_commit_data + (g->hash_len + 16) * lex_index;
+
+ item->object.parsed = 1;
set_commit_tree(item, NULL);
*pos = item->graph_pos;
return 1;
} else {
- return bsearch_graph(g, &(item->object.oid), pos);
+ struct commit_graph *cur_g = g;
+ uint32_t lex_index;
+
+ while (cur_g && !bsearch_graph(cur_g, &(item->object.oid), &lex_index))
+ cur_g = cur_g->base_graph;
+
+ if (cur_g) {
+ *pos = lex_index + cur_g->num_commits_in_base;
+ return 1;
+ }
+
+ return 0;
}
}
struct commit *c)
{
struct object_id oid;
- const unsigned char *commit_data = g->chunk_commit_data +
- GRAPH_DATA_WIDTH * (c->graph_pos);
+ const unsigned char *commit_data;
+
+ while (c->graph_pos < g->num_commits_in_base)
+ g = g->base_graph;
+
+ commit_data = g->chunk_commit_data +
+ GRAPH_DATA_WIDTH * (c->graph_pos - g->num_commits_in_base);
hashcpy(oid.hash, commit_data);
set_commit_tree(c, lookup_tree(r, &oid));
struct write_commit_graph_context {
struct repository *r;
- const char *obj_dir;
+ char *obj_dir;
char *graph_name;
struct packed_oid_list oids;
struct packed_commit_list commits;
struct progress *progress;
int progress_done;
uint64_t progress_cnt;
+
+ char *base_graph_name;
+ int num_commit_graphs_before;
+ int num_commit_graphs_after;
+ char **commit_graph_filenames_before;
+ char **commit_graph_filenames_after;
+ char **commit_graph_hash_after;
+ uint32_t new_num_commits_in_base;
+ struct commit_graph *new_base_graph;
+
unsigned append:1,
- report_progress:1;
+ report_progress:1,
+ split:1,
+ check_oids:1;
+
+ const struct split_commit_graph_opts *split_opts;
};
static void write_graph_chunk_fanout(struct hashfile *f,
ctx->commits.nr,
commit_to_sha1);
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
ctx->commits.list,
ctx->commits.nr,
commit_to_sha1);
+
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
ctx->commits.nr,
commit_to_sha1);
+ if (edge_value >= 0)
+ edge_value += ctx->new_num_commits_in_base;
+ else {
+ uint32_t pos;
+ if (find_commit_in_graph(parent->item,
+ ctx->new_base_graph,
+ &pos))
+ edge_value = pos;
+ }
+
if (edge_value < 0)
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
}
}
-static int commit_compare(const void *_a, const void *_b)
+static int oid_compare(const void *_a, const void *_b)
{
const struct object_id *a = (const struct object_id *)_a;
const struct object_id *b = (const struct object_id *)_b;
display_progress(ctx->progress, i + 1);
commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
- if (commit && !parse_commit_no_graph(commit))
+ if (!commit)
+ continue;
+ if (ctx->split) {
+ if (!parse_commit(commit) &&
+ commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+ add_missing_parents(ctx, commit);
+ } else if (!parse_commit_no_graph(commit))
add_missing_parents(ctx, commit);
}
stop_progress(&ctx->progress);
return 0;
}
-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags)
+int write_commit_graph_reachable(const char *obj_dir,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts)
{
struct string_list list = STRING_LIST_INIT_DUP;
int result;
for_each_ref(add_ref_to_list, &list);
result = write_commit_graph(obj_dir, NULL, &list,
- flags);
+ flags, split_opts);
string_list_clear(&list, 0);
return result;
}
stop_progress(&ctx->progress);
- strbuf_reset(&progress_title);
+ strbuf_release(&progress_title);
strbuf_release(&packname);
return 0;
}
-static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
- struct string_list *commit_hex)
+static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
+ struct string_list *commit_hex)
{
uint32_t i;
struct strbuf progress_title = STRBUF_INIT;
struct commit *result;
display_progress(ctx->progress, i + 1);
- if (commit_hex->items[i].string &&
- parse_oid_hex(commit_hex->items[i].string, &oid, &end))
- continue;
-
- result = lookup_commit_reference_gently(ctx->r, &oid, 1);
-
- if (result) {
+ if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
+ (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
ctx->oids.nr++;
+ } else if (ctx->check_oids) {
+ error(_("invalid commit object id: %s"),
+ commit_hex->items[i].string);
+ return -1;
}
}
stop_progress(&ctx->progress);
strbuf_release(&progress_title);
+
+ return 0;
}
static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
_("Counting distinct commits in commit graph"),
ctx->oids.nr);
display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */
- QSORT(ctx->oids.list, ctx->oids.nr, commit_compare);
+ QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);
for (i = 1; i < ctx->oids.nr; i++) {
display_progress(ctx->progress, i + 1);
- if (!oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
+ if (!oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) {
+ if (ctx->split) {
+ struct commit *c = lookup_commit(ctx->r, &ctx->oids.list[i]);
+
+ if (!c || c->graph_pos != COMMIT_NOT_FROM_GRAPH)
+ continue;
+ }
+
count_distinct++;
+ }
}
stop_progress(&ctx->progress);
if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
continue;
+ ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc);
ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.list[i]);
+
+ if (ctx->split &&
+ ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH)
+ continue;
+
parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
for (parent = ctx->commits.list[ctx->commits.nr]->parents;
stop_progress(&ctx->progress);
}
+static int write_graph_chunk_base_1(struct hashfile *f,
+ struct commit_graph *g)
+{
+ int num = 0;
+
+ if (!g)
+ return 0;
+
+ num = write_graph_chunk_base_1(f, g->base_graph);
+ hashwrite(f, g->oid.hash, the_hash_algo->rawsz);
+ return num + 1;
+}
+
+static int write_graph_chunk_base(struct hashfile *f,
+ struct write_commit_graph_context *ctx)
+{
+ int num = write_graph_chunk_base_1(f, ctx->new_base_graph);
+
+ if (num != ctx->num_commit_graphs_after - 1) {
+ error(_("failed to write correct number of base graph ids"));
+ return -1;
+ }
+
+ return 0;
+}
+
static int write_commit_graph_file(struct write_commit_graph_context *ctx)
{
uint32_t i;
+ int fd;
struct hashfile *f;
struct lock_file lk = LOCK_INIT;
- uint32_t chunk_ids[5];
- uint64_t chunk_offsets[5];
+ uint32_t chunk_ids[6];
+ uint64_t chunk_offsets[6];
const unsigned hashsz = the_hash_algo->rawsz;
struct strbuf progress_title = STRBUF_INIT;
- int num_chunks = ctx->num_extra_edges ? 4 : 3;
+ int num_chunks = 3;
+ struct object_id file_hash;
+
+ if (ctx->split) {
+ struct strbuf tmp_file = STRBUF_INIT;
+
+ strbuf_addf(&tmp_file,
+ "%s/info/commit-graphs/tmp_graph_XXXXXX",
+ ctx->obj_dir);
+ ctx->graph_name = strbuf_detach(&tmp_file, NULL);
+ } else {
+ ctx->graph_name = get_commit_graph_filename(ctx->obj_dir);
+ }
- ctx->graph_name = get_commit_graph_filename(ctx->obj_dir);
if (safe_create_leading_directories(ctx->graph_name)) {
UNLEAK(ctx->graph_name);
error(_("unable to create leading directories of %s"),
return -1;
}
- hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR);
- f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ if (ctx->split) {
+ char *lock_name = get_chain_filename(ctx->obj_dir);
- hashwrite_be32(f, GRAPH_SIGNATURE);
+ hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR);
- hashwrite_u8(f, GRAPH_VERSION);
- hashwrite_u8(f, oid_version());
- hashwrite_u8(f, num_chunks);
- hashwrite_u8(f, 0); /* unused padding byte */
+ fd = git_mkstemp_mode(ctx->graph_name, 0444);
+ if (fd < 0) {
+ error(_("unable to create '%s'"), ctx->graph_name);
+ return -1;
+ }
+
+ f = hashfd(fd, ctx->graph_name);
+ } else {
+ hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR);
+ fd = lk.tempfile->fd;
+ f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ }
chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
chunk_ids[2] = GRAPH_CHUNKID_DATA;
- if (ctx->num_extra_edges)
- chunk_ids[3] = GRAPH_CHUNKID_EXTRAEDGES;
- else
- chunk_ids[3] = 0;
- chunk_ids[4] = 0;
+ if (ctx->num_extra_edges) {
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
+ num_chunks++;
+ }
+ if (ctx->num_commit_graphs_after > 1) {
+ chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
+ num_chunks++;
+ }
+
+ chunk_ids[num_chunks] = 0;
chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH;
chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
chunk_offsets[2] = chunk_offsets[1] + hashsz * ctx->commits.nr;
chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * ctx->commits.nr;
- chunk_offsets[4] = chunk_offsets[3] + 4 * ctx->num_extra_edges;
+
+ num_chunks = 3;
+ if (ctx->num_extra_edges) {
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ 4 * ctx->num_extra_edges;
+ num_chunks++;
+ }
+ if (ctx->num_commit_graphs_after > 1) {
+ chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
+ hashsz * (ctx->num_commit_graphs_after - 1);
+ num_chunks++;
+ }
+
+ hashwrite_be32(f, GRAPH_SIGNATURE);
+
+ hashwrite_u8(f, GRAPH_VERSION);
+ hashwrite_u8(f, oid_version());
+ hashwrite_u8(f, num_chunks);
+ hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
for (i = 0; i <= num_chunks; i++) {
uint32_t chunk_write[3];
write_graph_chunk_data(f, hashsz, ctx);
if (ctx->num_extra_edges)
write_graph_chunk_extra_edges(f, ctx);
+ if (ctx->num_commit_graphs_after > 1 &&
+ write_graph_chunk_base(f, ctx)) {
+ return -1;
+ }
stop_progress(&ctx->progress);
strbuf_release(&progress_title);
+ if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) {
+ char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid));
+ char *new_base_name = get_split_graph_filename(ctx->new_base_graph->obj_dir, new_base_hash);
+
+ free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]);
+ free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]);
+ ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2] = new_base_name;
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2] = new_base_hash;
+ }
+
close_commit_graph(ctx->r->objects);
- finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+ finalize_hashfile(f, file_hash.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+
+ if (ctx->split) {
+ FILE *chainf = fdopen_lock_file(&lk, "w");
+ char *final_graph_name;
+ int result;
+
+ close(fd);
+
+ if (!chainf) {
+ error(_("unable to open commit-graph chain file"));
+ return -1;
+ }
+
+ if (ctx->base_graph_name) {
+ const char *dest = ctx->commit_graph_filenames_after[
+ ctx->num_commit_graphs_after - 2];
+
+ if (strcmp(ctx->base_graph_name, dest)) {
+ result = rename(ctx->base_graph_name, dest);
+
+ if (result) {
+ error(_("failed to rename base commit-graph file"));
+ return -1;
+ }
+ }
+ } else {
+ char *graph_name = get_commit_graph_filename(ctx->obj_dir);
+ unlink(graph_name);
+ }
+
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(oid_to_hex(&file_hash));
+ final_graph_name = get_split_graph_filename(ctx->obj_dir,
+ ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]);
+ ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name;
+
+ result = rename(ctx->graph_name, final_graph_name);
+
+ for (i = 0; i < ctx->num_commit_graphs_after; i++)
+ fprintf(lk.tempfile->fp, "%s\n", ctx->commit_graph_hash_after[i]);
+
+ if (result) {
+ error(_("failed to rename temporary commit-graph file"));
+ return -1;
+ }
+ }
+
commit_lock_file(&lk);
return 0;
}
+static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
+{
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+ uint32_t num_commits = ctx->commits.nr;
+ uint32_t i;
+
+ int max_commits = 0;
+ int size_mult = 2;
+
+ if (ctx->split_opts) {
+ max_commits = ctx->split_opts->max_commits;
+ size_mult = ctx->split_opts->size_multiple;
+ }
+
+ g = ctx->r->objects->commit_graph;
+ ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
+
+ while (g && (g->num_commits <= size_mult * num_commits ||
+ (max_commits && num_commits > max_commits))) {
+ if (strcmp(g->obj_dir, ctx->obj_dir))
+ break;
+
+ num_commits += g->num_commits;
+ g = g->base_graph;
+
+ ctx->num_commit_graphs_after--;
+ }
+
+ ctx->new_base_graph = g;
+
+ if (ctx->num_commit_graphs_after == 2) {
+ char *old_graph_name = get_commit_graph_filename(g->obj_dir);
+
+ if (!strcmp(g->filename, old_graph_name) &&
+ strcmp(g->obj_dir, ctx->obj_dir)) {
+ ctx->num_commit_graphs_after = 1;
+ ctx->new_base_graph = NULL;
+ }
+
+ free(old_graph_name);
+ }
+
+ ALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after);
+ ALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after);
+
+ for (i = 0; i < ctx->num_commit_graphs_after &&
+ i < ctx->num_commit_graphs_before; i++)
+ ctx->commit_graph_filenames_after[i] = xstrdup(ctx->commit_graph_filenames_before[i]);
+
+ i = ctx->num_commit_graphs_before - 1;
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ if (i < ctx->num_commit_graphs_after)
+ ctx->commit_graph_hash_after[i] = xstrdup(oid_to_hex(&g->oid));
+
+ i--;
+ g = g->base_graph;
+ }
+}
+
+static void merge_commit_graph(struct write_commit_graph_context *ctx,
+ struct commit_graph *g)
+{
+ uint32_t i;
+ uint32_t offset = g->num_commits_in_base;
+
+ ALLOC_GROW(ctx->commits.list, ctx->commits.nr + g->num_commits, ctx->commits.alloc);
+
+ for (i = 0; i < g->num_commits; i++) {
+ struct object_id oid;
+ struct commit *result;
+
+ display_progress(ctx->progress, i + 1);
+
+ load_oid_from_graph(g, i + offset, &oid);
+
+ /* only add commits if they still exist in the repo */
+ result = lookup_commit_reference_gently(ctx->r, &oid, 1);
+
+ if (result) {
+ ctx->commits.list[ctx->commits.nr] = result;
+ ctx->commits.nr++;
+ }
+ }
+}
+
+static int commit_compare(const void *_a, const void *_b)
+{
+ const struct commit *a = *(const struct commit **)_a;
+ const struct commit *b = *(const struct commit **)_b;
+ return oidcmp(&a->object.oid, &b->object.oid);
+}
+
+static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
+{
+ uint32_t i, num_parents;
+ struct commit_list *parent;
+
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Scanning merged commits"),
+ ctx->commits.nr);
+
+ QSORT(ctx->commits.list, ctx->commits.nr, commit_compare);
+
+ ctx->num_extra_edges = 0;
+ for (i = 0; i < ctx->commits.nr; i++) {
+ display_progress(ctx->progress, i);
+
+ if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
+ &ctx->commits.list[i]->object.oid)) {
+ die(_("unexpected duplicate commit id %s"),
+ oid_to_hex(&ctx->commits.list[i]->object.oid));
+ } else {
+ num_parents = 0;
+ for (parent = ctx->commits.list[i]->parents; parent; parent = parent->next)
+ num_parents++;
+
+ if (num_parents > 2)
+ ctx->num_extra_edges += num_parents - 1;
+ }
+ }
+
+ stop_progress(&ctx->progress);
+}
+
+static void merge_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+ uint32_t current_graph_number = ctx->num_commit_graphs_before;
+ struct strbuf progress_title = STRBUF_INIT;
+
+ while (g && current_graph_number >= ctx->num_commit_graphs_after) {
+ current_graph_number--;
+
+ if (ctx->report_progress) {
+ strbuf_addstr(&progress_title, _("Merging commit-graph"));
+ ctx->progress = start_delayed_progress(progress_title.buf, 0);
+ }
+
+ merge_commit_graph(ctx, g);
+ stop_progress(&ctx->progress);
+ strbuf_release(&progress_title);
+
+ g = g->base_graph;
+ }
+
+ if (g) {
+ ctx->new_base_graph = g;
+ ctx->new_num_commits_in_base = g->num_commits + g->num_commits_in_base;
+ }
+
+ if (ctx->new_base_graph)
+ ctx->base_graph_name = xstrdup(ctx->new_base_graph->filename);
+
+ sort_and_scan_merged_commits(ctx);
+}
+
+static void mark_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ uint32_t i;
+ time_t now = time(NULL);
+
+ for (i = ctx->num_commit_graphs_after - 1; i < ctx->num_commit_graphs_before; i++) {
+ struct stat st;
+ struct utimbuf updated_time;
+
+ stat(ctx->commit_graph_filenames_before[i], &st);
+
+ updated_time.actime = st.st_atime;
+ updated_time.modtime = now;
+ utime(ctx->commit_graph_filenames_before[i], &updated_time);
+ }
+}
+
+static void expire_commit_graphs(struct write_commit_graph_context *ctx)
+{
+ struct strbuf path = STRBUF_INIT;
+ DIR *dir;
+ struct dirent *de;
+ size_t dirnamelen;
+ timestamp_t expire_time = time(NULL);
+
+ if (ctx->split_opts && ctx->split_opts->expire_time)
+ expire_time -= ctx->split_opts->expire_time;
+ if (!ctx->split) {
+ char *chain_file_name = get_chain_filename(ctx->obj_dir);
+ unlink(chain_file_name);
+ free(chain_file_name);
+ ctx->num_commit_graphs_after = 0;
+ }
+
+ strbuf_addstr(&path, ctx->obj_dir);
+ strbuf_addstr(&path, "/info/commit-graphs");
+ dir = opendir(path.buf);
+
+ if (!dir)
+ goto out;
+
+ strbuf_addch(&path, '/');
+ dirnamelen = path.len;
+ while ((de = readdir(dir)) != NULL) {
+ struct stat st;
+ uint32_t i, found = 0;
+
+ strbuf_setlen(&path, dirnamelen);
+ strbuf_addstr(&path, de->d_name);
+
+ stat(path.buf, &st);
+
+ if (st.st_mtime > expire_time)
+ continue;
+ if (path.len < 6 || strcmp(path.buf + path.len - 6, ".graph"))
+ continue;
+
+ for (i = 0; i < ctx->num_commit_graphs_after; i++) {
+ if (!strcmp(ctx->commit_graph_filenames_after[i],
+ path.buf)) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ unlink(path.buf);
+ }
+
+out:
+ strbuf_release(&path);
+}
+
int write_commit_graph(const char *obj_dir,
struct string_list *pack_indexes,
struct string_list *commit_hex,
- unsigned int flags)
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts)
{
struct write_commit_graph_context *ctx;
uint32_t i, count_distinct = 0;
+ size_t len;
int res = 0;
if (!commit_graph_compatible(the_repository))
ctx = xcalloc(1, sizeof(struct write_commit_graph_context));
ctx->r = the_repository;
- ctx->obj_dir = obj_dir;
- ctx->append = flags & COMMIT_GRAPH_APPEND ? 1 : 0;
- ctx->report_progress = flags & COMMIT_GRAPH_PROGRESS ? 1 : 0;
+
+ /* normalize object dir with no trailing slash */
+ ctx->obj_dir = xmallocz(strlen(obj_dir) + 1);
+ normalize_path_copy(ctx->obj_dir, obj_dir);
+ len = strlen(ctx->obj_dir);
+ if (len && ctx->obj_dir[len - 1] == '/')
+ ctx->obj_dir[len - 1] = 0;
+
+ ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
+ ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
+ ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
+ ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
+ ctx->split_opts = split_opts;
+
+ if (ctx->split) {
+ struct commit_graph *g;
+ prepare_commit_graph(ctx->r);
+
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ ctx->num_commit_graphs_before++;
+ g = g->base_graph;
+ }
+
+ if (ctx->num_commit_graphs_before) {
+ ALLOC_ARRAY(ctx->commit_graph_filenames_before, ctx->num_commit_graphs_before);
+ i = ctx->num_commit_graphs_before;
+ g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ ctx->commit_graph_filenames_before[--i] = xstrdup(g->filename);
+ g = g->base_graph;
+ }
+ }
+ }
ctx->approx_nr_objects = approximate_object_count();
ctx->oids.alloc = ctx->approx_nr_objects / 32;
+ if (ctx->split && split_opts && ctx->oids.alloc > split_opts->max_commits)
+ ctx->oids.alloc = split_opts->max_commits;
+
if (ctx->append) {
prepare_commit_graph_one(ctx->r, ctx->obj_dir);
if (ctx->r->objects->commit_graph)
goto cleanup;
}
- if (commit_hex)
- fill_oids_from_commit_hex(ctx, commit_hex);
+ if (commit_hex) {
+ if ((res = fill_oids_from_commit_hex(ctx, commit_hex)))
+ goto cleanup;
+ }
if (!pack_indexes && !commit_hex)
fill_oids_from_all_packs(ctx);
goto cleanup;
}
+ if (!ctx->commits.nr)
+ goto cleanup;
+
+ if (ctx->split) {
+ split_graph_merge_strategy(ctx);
+
+ merge_commit_graphs(ctx);
+ } else
+ ctx->num_commit_graphs_after = 1;
+
compute_generation_numbers(ctx);
res = write_commit_graph_file(ctx);
+ if (ctx->split)
+ mark_commit_graphs(ctx);
+
+ expire_commit_graphs(ctx);
+
cleanup:
free(ctx->graph_name);
free(ctx->commits.list);
free(ctx->oids.list);
+ free(ctx->obj_dir);
+
+ if (ctx->commit_graph_filenames_after) {
+ for (i = 0; i < ctx->num_commit_graphs_after; i++) {
+ free(ctx->commit_graph_filenames_after[i]);
+ free(ctx->commit_graph_hash_after[i]);
+ }
+
+ for (i = 0; i < ctx->num_commit_graphs_before; i++)
+ free(ctx->commit_graph_filenames_before[i]);
+
+ free(ctx->commit_graph_filenames_after);
+ free(ctx->commit_graph_filenames_before);
+ free(ctx->commit_graph_hash_after);
+ }
+
free(ctx);
return res;
#define GENERATION_ZERO_EXISTS 1
#define GENERATION_NUMBER_EXISTS 2
-int verify_commit_graph(struct repository *r, struct commit_graph *g)
+int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
{
uint32_t i, cur_fanout_pos = 0;
struct object_id prev_oid, cur_oid, checksum;
struct hashfile *f;
int devnull;
struct progress *progress = NULL;
+ int local_error = 0;
if (!g) {
graph_report("no commit-graph file loaded");
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
graph_commit = lookup_commit(r, &cur_oid);
- odb_commit = (struct commit *)create_object(r, cur_oid.hash, alloc_commit_node(r));
+ odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));
if (parse_commit_internal(odb_commit, 0, 0)) {
graph_report(_("failed to parse commit %s from object database for commit-graph"),
oid_to_hex(&cur_oid));
break;
}
+ /* parse parent in case it is in a base graph */
+ parse_commit_in_graph_one(r, g, graph_parents->item);
+
if (!oideq(&graph_parents->item->object.oid, &odb_parents->item->object.oid))
graph_report(_("commit-graph parent for %s is %s != %s"),
oid_to_hex(&cur_oid),
}
stop_progress(&progress);
- return verify_commit_graph_error;
+ local_error = verify_commit_graph_error;
+
+ if (!(flags & COMMIT_GRAPH_VERIFY_SHALLOW) && g->base_graph)
+ local_error |= verify_commit_graph(r, g->base_graph, flags);
+
+ return local_error;
}
void free_commit_graph(struct commit_graph *g)
g->data = NULL;
close(g->graph_fd);
}
+ free(g->filename);
free(g);
}
unsigned char num_chunks;
uint32_t num_commits;
struct object_id oid;
+ char *filename;
+ const char *obj_dir;
+
+ uint32_t num_commits_in_base;
+ struct commit_graph *base_graph;
const uint32_t *chunk_oid_fanout;
const unsigned char *chunk_oid_lookup;
const unsigned char *chunk_commit_data;
const unsigned char *chunk_extra_edges;
+ const unsigned char *chunk_base_graphs;
};
struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st);
-
+struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir);
struct commit_graph *parse_commit_graph(void *graph_map, int fd,
size_t graph_size);
*/
int generation_numbers_enabled(struct repository *r);
-#define COMMIT_GRAPH_APPEND (1 << 0)
-#define COMMIT_GRAPH_PROGRESS (1 << 1)
+enum commit_graph_write_flags {
+ COMMIT_GRAPH_WRITE_APPEND = (1 << 0),
+ COMMIT_GRAPH_WRITE_PROGRESS = (1 << 1),
+ COMMIT_GRAPH_WRITE_SPLIT = (1 << 2),
+ /* Make sure that each OID in the input is a valid commit OID. */
+ COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
+};
+
+struct split_commit_graph_opts {
+ int size_multiple;
+ int max_commits;
+ timestamp_t expire_time;
+};
/*
* The write_commit_graph* methods return zero on success
* is not compatible with the commit-graph feature, then the
* methods will return 0 without writing a commit-graph.
*/
-int write_commit_graph_reachable(const char *obj_dir, unsigned int flags);
+int write_commit_graph_reachable(const char *obj_dir,
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts);
int write_commit_graph(const char *obj_dir,
struct string_list *pack_indexes,
struct string_list *commit_hex,
- unsigned int flags);
+ enum commit_graph_write_flags flags,
+ const struct split_commit_graph_opts *split_opts);
+
+#define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0)
-int verify_commit_graph(struct repository *r, struct commit_graph *g);
+int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags);
void close_commit_graph(struct raw_object_store *);
void free_commit_graph(struct commit_graph *);
struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_commit_node(r));
+ return create_object(r, oid, alloc_commit_node(r));
return object_as_type(r, obj, OBJ_COMMIT, 0);
}
void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
{
set_commit_tree(c, NULL);
- c->index = 0;
free_commit_buffer(pool, c);
+ c->index = 0;
free_commit_list(c->parents);
c->object.parsed = 0;
git_resolve_executable_dir(argv[0]);
- trace2_initialize();
- trace2_cmd_start(argv);
- trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
-
git_setup_gettext();
initialize_the_repository();
attr_start();
+ trace2_initialize();
+ trace2_cmd_start(argv);
+ trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
+
result = cmd_main(argc, argv);
trace2_cmd_exit(result);
}
ALLOC_ARRAY(result, size);
- memcpy(result, wenv, size * sizeof(*wenv));
+ COPY_ARRAY(result, wenv, size);
FreeEnvironmentStringsW(wenv);
return result;
}
continue;
size = wcslen(array[i]) + 1;
- memcpy(p, array[i], size * sizeof(*p));
+ COPY_ARRAY(p, array[i], size);
p += size;
}
*p = L'\0';
do_unset_environment_variables();
/* Determine whether or not we are associated to a console */
- cons = CreateFile("CONOUT$", GENERIC_WRITE,
+ cons = CreateFileW(L"CONOUT$", GENERIC_WRITE,
FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (cons == INVALID_HANDLE_VALUE) {
if (prog) {
int exec_id;
int argc = 0;
- const char **argv2;
+#ifndef _MSC_VER
+ const
+#endif
+ char **argv2;
while (argv[argc]) argc++;
ALLOC_ARRAY(argv2, argc + 1);
argv2[0] = (char *)cmd; /* full path to the script file */
static unsigned initialized;
static char user_name[100];
static struct passwd *p;
+ wchar_t buf[100];
DWORD len;
if (initialized)
return p;
- len = sizeof(user_name);
- if (!GetUserName(user_name, &len)) {
+ len = ARRAY_SIZE(buf);
+ if (!GetUserNameW(buf, &len)) {
+ initialized = 1;
+ return NULL;
+ }
+
+ if (xwcstoutf(user_name, buf, sizeof(user_name)) < 0) {
initialized = 1;
return NULL;
}
sigint_fn(SIGINT);
return 0;
+#if defined(_MSC_VER)
+ case SIGILL:
+ case SIGFPE:
+ case SIGSEGV:
+ case SIGTERM:
+ case SIGBREAK:
+ case SIGABRT:
+ case SIGABRT_COMPAT:
+ /*
+ * The <signal.h> header in the MS C Runtime defines 8 signals
+ * as being supported on the platform. Anything else causes an
+ * "Invalid signal or error" (which in DEBUG builds causes the
+ * Abort/Retry/Ignore dialog). We by-pass the CRT for things we
+ * already know will fail.
+ */
+ return raise(sig);
+ default:
+ errno = EINVAL;
+ return -1;
+
+#else
+
default:
return raise(sig);
+
+#endif
+
}
}
/* simulate TERM to enable auto-color (see color.c) */
if (!getenv("TERM"))
setenv("TERM", "cygwin", 1);
+
+ /* calculate HOME if not set */
+ if (!getenv("HOME")) {
+ /*
+ * try $HOMEDRIVE$HOMEPATH - the home share may be a network
+ * location, thus also check if the path exists (i.e. is not
+ * disconnected)
+ */
+ if ((tmp = getenv("HOMEDRIVE"))) {
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addstr(&buf, tmp);
+ if ((tmp = getenv("HOMEPATH"))) {
+ strbuf_addstr(&buf, tmp);
+ if (is_directory(buf.buf))
+ setenv("HOME", buf.buf, 1);
+ else
+ tmp = NULL; /* use $USERPROFILE */
+ }
+ strbuf_release(&buf);
+ }
+ /* use $USERPROFILE if the home share is not available */
+ if (!tmp && (tmp = getenv("USERPROFILE")))
+ setenv("HOME", tmp, 1);
+ }
}
+#if !defined(_MSC_VER)
/*
* Disable MSVCRT command line wildcard expansion (__getmainargs called from
* mingw startup code, see init.c in mingw runtime).
*/
int _CRT_glob = 0;
-
-typedef struct {
- int newmode;
-} _startupinfo;
-
-extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob,
- _startupinfo *si);
+#endif
static NORETURN void die_startup(void)
{
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
}
-void mingw_startup(void)
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#include <crtdbg.h>
+#endif
+#endif
+
+/*
+ * We implement wmain() and compile with -municode, which would
+ * normally ignore main(), but we call the latter from the former
+ * so that we can handle non-ASCII command-line parameters
+ * appropriately.
+ *
+ * To be more compatible with the core git code, we convert
+ * argv into UTF8 and pass them directly to main().
+ */
+int wmain(int argc, const wchar_t **wargv)
{
- int i, maxlen, argc;
- char *buffer;
- wchar_t **wenv, **wargv;
- _startupinfo si;
+ int i, maxlen, exit_status;
+ char *buffer, **save;
+ const char **argv;
trace2_initialize_clock();
- maybe_redirect_std_handles();
+#ifdef _MSC_VER
+#ifdef _DEBUG
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+#endif
- /* get wide char arguments and environment */
- si.newmode = 0;
- if (__wgetmainargs(&argc, &wargv, &wenv, _CRT_glob, &si) < 0)
- die_startup();
+#ifdef USE_MSVC_CRTDBG
+ _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+#endif
+
+ maybe_redirect_std_handles();
/* determine size of argv and environ conversion buffer */
maxlen = wcslen(wargv[0]);
maxlen = 3 * maxlen + 1;
buffer = malloc_startup(maxlen);
- /* convert command line arguments and environment to UTF-8 */
+ /*
+ * Create a UTF-8 version of w_argv. Also create a "save" copy
+ * to remember all the string pointers because parse_options()
+ * will remove claimed items from the argv that we pass down.
+ */
+ ALLOC_ARRAY(argv, argc + 1);
+ ALLOC_ARRAY(save, argc + 1);
for (i = 0; i < argc; i++)
- __argv[i] = wcstoutfdup_startup(buffer, wargv[i], maxlen);
+ argv[i] = save[i] = wcstoutfdup_startup(buffer, wargv[i], maxlen);
+ argv[i] = save[i] = NULL;
free(buffer);
/* fix Windows specific environment settings */
/* initialize Unicode console */
winansi_init();
+
+ /* invoke the real main() using our utf8 version of argv. */
+ exit_status = main(argc, argv);
+
+ for (i = 0; i < argc; i++)
+ free(save[i]);
+ free(save);
+ free(argv);
+
+ return exit_status;
}
int uname(struct utsname *buf)
#undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif
-extern int mingw_core_config(const char *var, const char *value, void *cb);
+int mingw_core_config(const char *var, const char *value, void *cb);
#define platform_core_config mingw_core_config
/*
#ifndef __MINGW64_VERSION_MAJOR
#define off_t off64_t
#define lseek _lseeki64
+#ifndef _MSC_VER
struct timespec {
time_t tv_sec;
long tv_nsec;
};
#endif
+#endif
struct mingw_stat {
_dev_t st_dev;
*path = '/';
}
#define PATH_SEP ';'
-extern char *mingw_query_user_email(void);
+char *mingw_query_user_email(void);
#define query_user_email mingw_query_user_email
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
#define PRIuMAX "I64u"
extern CRITICAL_SECTION pinfo_cs;
/*
- * A replacement of main() that adds win32 specific initialization.
+ * Git, like most portable C applications, implements a main() function. On
+ * Windows, this main() function would receive parameters encoded in the
+ * current locale, but Git for Windows would prefer UTF-8 encoded parameters.
+ *
+ * To make that happen, we still declare main() here, and then declare and
+ * implement wmain() (which is the Unicode variant of main()) and compile with
+ * -municode. This wmain() function reencodes the parameters from UTF-16 to
+ * UTF-8 format, sets up a couple of other things as required on Windows, and
+ * then hands off to the main() function.
*/
-
-void mingw_startup(void);
-#define main(c,v) dummy_decl_mingw_main(void); \
-static int mingw_main(c,v); \
-int main(int argc, const char **argv) \
-{ \
- mingw_startup(); \
- return mingw_main(__argc, (void *)__argv); \
-} \
-static int mingw_main(c,v)
+int wmain(int argc, const wchar_t **w_argv);
+int main(int argc, const char **argv);
/*
* Used by Pthread API implementation for Windows
*/
-extern int err_win_to_posix(DWORD winerr);
+int err_win_to_posix(DWORD winerr);
#include <malloc.h>
#include <io.h>
+#pragma warning(disable: 4018) /* signed/unsigned comparison */
+#pragma warning(disable: 4244) /* type conversion, possible loss of data */
+#pragma warning(disable: 4090) /* 'function' : different 'const' qualifiers (ALLOC_GROW etc.)*/
+
/* porting function */
#define inline __inline
#define __inline__ __inline
#undef ERROR
+#define ftello _ftelli64
+
+typedef int sigset_t;
+/* open for reading, writing, or both (not in fcntl.h) */
+#define O_ACCMODE (_O_RDONLY | _O_WRONLY | _O_RDWR)
+
#include "compat/mingw.h"
#endif
assert(sl->l != 0);
assert(sl->threadid == CURRENT_THREAD);
if (--sl->c == 0) {
- sl->threadid = 0;
volatile unsigned int* lp = &sl->l;
int prev = 0;
int ret;
+ sl->threadid = 0;
__asm__ __volatile__ ("lock; xchgl %0, %1"
: "=r" (ret)
: "m" (*(lp)), "0"(prev)
#if !ONLY_MSPACES
/* Set up lock for main malloc area */
gm->mflags = mparams.default_mflags;
- INITIAL_LOCK(&gm->mutex);
+ (void)INITIAL_LOCK(&gm->mutex);
#endif
#if (FOOTERS && !INSECURE)
mchunkptr msp = align_as_chunk(tbase);
mstate m = (mstate)(chunk2mem(msp));
memset(m, 0, msize);
- INITIAL_LOCK(&m->mutex);
+ (void)INITIAL_LOCK(&m->mutex);
msp->head = (msize|PINUSE_BIT|CINUSE_BIT);
m->seg.base = m->least_addr = tbase;
m->seg.size = m->footprint = m->max_footprint = tsize;
( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \
((((h)->temp.tempint > 0 \
&& (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \
- ? (int) ((h)->next_free = (h)->object_base \
+ ? (ptrdiff_t) ((h)->next_free = (h)->object_base \
= (h)->temp.tempint + (char *) (h)->chunk) \
: (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
if (!once_only)
{
NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
- GetProcAddress (GetModuleHandle ("ntdll.dll"),
+ GetProcAddress (GetModuleHandleW (L"ntdll.dll"),
"NtQueryInformationFile");
once_only = TRUE;
}
--- /dev/null
+/vcpkg/
+/MSVC-DEFS-GEN
+/VCPKG-DEFS
+The Steps to Build Git with VS2015 or VS2017 from the command line.
+
+1. Install the "vcpkg" open source package manager and build essential
+ third-party libraries. The steps for this have been captured in a
+ set of convenience scripts. These can be run from a stock Command
+ Prompt or from an SDK bash window:
+
+ $ cd <repo_root>
+ $ ./compat/vcbuild/vcpkg_install.bat
+
+ The vcpkg tools and all of the third-party sources will be installed
+ in this folder:
+ <repo_root>/compat/vcbuild/vcpkg/
+
+ A file will be created with a set of Makefile macros pointing to a
+ unified "include", "lib", and "bin" directory (release and debug) for
+ all of the required packages. This file will be included by the main
+ Makefile:
+ <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
+
+2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
+ root to make it easier to run and debug git.exe without having to
+ manipulate your PATH. This is especially true for debug sessions in
+ Visual Studio.
+
+ Use ONE of the following forms which should match how you want to
+ compile git.exe.
+
+ $ ./compat/vcbuild/vcpkg_copy_packages.bat debug
+ $ ./compat/vcbuild/vcpkg_copy_packages.bat release
+
+3. Build git using MSVC from an SDK bash window using one of the
+ following commands:
+
+ $ make MSVC=1
+ $ make MSVC=1 DEBUG=1
+
+================================================================
+
+Alternatively, run `make vcxproj` and then load the generated `git.sln` in
+Visual Studio. The initial build will install the vcpkg system and build the
+dependencies automatically. This will take a while.
+
+Instead of generating the `git.sln` file yourself (which requires a full Git
+for Windows SDK), you may want to consider fetching the `vs/master` branch of
+https://github.com/git-for-windows/git instead (which is updated automatically
+via CI running `make vcxproj`). The `vs/master` branch does not require a Git
+for Windows to build, but you can run the test scripts in a regular Git Bash.
+
+Note that `make vcxproj` will automatically add and commit the generated `.sln`
+and `.vcxproj` files to the repo. This is necessary to allow building a
+fully-testable Git in Visual Studio, where a regular Git Bash can be used to
+run the test scripts (as opposed to a full Git for Windows SDK): a number of
+build targets, such as Git commands implemented as Unix shell scripts (where
+`@@SHELL_PATH@@` and other placeholders are interpolated) require a full-blown
+Git for Windows SDK (which is about 10x the size of a regular Git for Windows
+installation).
+
+If your plan is to open a Pull Request with Git for Windows, it is a good idea
+to drop this commit before submitting.
+
+================================================================
The Steps of Build Git with VS2008
1. You need the build environment, which contains the Git dependencies
--- /dev/null
+@ECHO OFF
+REM ================================================================
+REM You can use either GCC (the default) or MSVC to build git
+REM using the GIT-SDK command line tools.
+REM $ make
+REM $ make MSVC=1
+REM
+REM GIT-SDK BASH windows inherit environment variables with all of
+REM the bin/lib/include paths for GCC. It DOES NOT inherit values
+REM for the corresponding MSVC tools.
+REM
+REM During normal (non-git) Windows development, you launch one
+REM of the provided "developer command prompts" to set environment
+REM variables for the MSVC tools.
+REM
+REM Therefore, to allow MSVC command line builds of git from BASH
+REM and MAKE, we must blend these two different worlds. This script
+REM attempts to do that.
+REM ================================================================
+REM This BAT file starts in a plain (non-developer) command prompt,
+REM searches for the "best" commmand prompt setup script, installs
+REM it into the current CMD process, and exports the various MSVC
+REM environment variables for use by MAKE.
+REM
+REM The output of this script should be written to a make "include
+REM file" and referenced by the top-level Makefile.
+REM
+REM See "config.mak.uname" (look for compat/vcbuild/MSVC-DEFS-GEN).
+REM ================================================================
+REM The provided command prompts are custom to each VS release and
+REM filled with lots of internal knowledge (such as Registry settings);
+REM even their names vary by release, so it is not appropriate for us
+REM to look inside them. Rather, just run them in a subordinate
+REM process and extract the settings we need.
+REM ================================================================
+REM
+REM Current (VS2017 and beyond)
+REM -------------------
+REM Visual Studio 2017 introduced a new installation layout and
+REM support for side-by-side installation of multiple versions of
+REM VS2017. Furthermore, these can all coexist with installations
+REM of previous versions of VS (which have a completely different
+REM layout on disk).
+REM
+REM VS2017 Update 2 introduced a "vswhere.exe" command:
+REM https://github.com/Microsoft/vswhere
+REM https://blogs.msdn.microsoft.com/heaths/2017/02/25/vswhere-available/
+REM https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/
+REM
+REM VS2015
+REM ------
+REM Visual Studio 2015 uses the traditional VcVarsAll.
+REM
+REM Earlier Versions
+REM ----------------
+REM Currently unsupported.
+REM
+REM ================================================================
+REM Note: Throughout this script we use "dir <path> && <cmd>" rather
+REM than "if exist <path>" because of script problems with pathnames
+REM containing spaces.
+REM ================================================================
+
+REM Sanitize PATH to prevent git-sdk paths from confusing "wmic.exe"
+REM (called internally in some of the system BAT files).
+SET PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;
+
+REM ================================================================
+
+:current
+ SET vs_where=C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe
+ dir "%vs_where%" >nul 2>nul && GOTO have_vs_where
+ GOTO not_2017
+
+:have_vs_where
+ REM Try to use VsWhere to get the location of VsDevCmd.
+
+ REM Keep VsDevCmd from cd'ing away.
+ SET VSCMD_START_DIR=.
+
+ REM Get the root of the VS product installation.
+ FOR /F "usebackq tokens=*" %%i IN (`"%vs_where%" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath`) DO @SET vs_ip=%%i
+
+ SET vs_devcmd=%vs_ip%\Common7\Tools\VsDevCmd.bat
+ dir "%vs_devcmd%" >nul 2>nul && GOTO have_vs_devcmd
+ GOTO not_2017
+
+:have_vs_devcmd
+ REM Use VsDevCmd to setup the environment of this process.
+ REM Setup CL for building 64-bit apps using 64-bit tools.
+ @call "%vs_devcmd%" -no_logo -arch=x64 -host_arch=x64
+
+ SET tgt=%VSCMD_ARG_TGT_ARCH%
+
+ SET mn=%VCToolsInstallDir%
+ SET msvc_includes=-I"%mn%INCLUDE"
+ SET msvc_libs=-L"%mn%lib\%tgt%"
+ SET msvc_bin_dir=%mn%bin\Host%VSCMD_ARG_HOST_ARCH%\%tgt%
+
+ SET sdk_dir=%WindowsSdkDir%
+ SET sdk_ver=%WindowsSDKVersion%
+ SET si=%sdk_dir%Include\%sdk_ver%
+ SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared"
+ SET sl=%sdk_dir%lib\%sdk_ver%
+ SET sdk_libs=-L"%sl%ucrt\%tgt%" -L"%sl%um\%tgt%"
+
+ SET vs_ver=%VisualStudioVersion%
+
+ GOTO print_vars
+
+REM ================================================================
+
+:not_2017
+ REM See if VS2015 is installed.
+
+ SET vs_2015_bat=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
+ dir "%vs_2015_bat%" >nul 2>nul && GOTO have_vs_2015
+ GOTO not_2015
+
+:have_vs_2015
+ REM Use VcVarsAll like the "x64 Native" command prompt.
+ REM Setup CL for building 64-bit apps using 64-bit tools.
+ @call "%vs_2015_bat%" amd64
+
+ REM Note that in VS2015 they use "x64" in some contexts and "amd64" in others.
+ SET mn=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
+ SET msvc_includes=-I"%mn%INCLUDE"
+ SET msvc_libs=-L"%mn%lib\amd64"
+ SET msvc_bin_dir=%mn%bin\amd64
+
+ SET sdk_dir=%WindowsSdkDir%
+ SET sdk_ver=%WindowsSDKVersion%
+ SET si=%sdk_dir%Include\%sdk_ver%
+ SET sdk_includes=-I"%si%ucrt" -I"%si%um" -I"%si%shared" -I"%si%winrt"
+ SET sl=%sdk_dir%lib\%sdk_ver%
+ SET sdk_libs=-L"%sl%ucrt\x64" -L"%sl%um\x64"
+
+ SET vs_ver=%VisualStudioVersion%
+
+ GOTO print_vars
+
+REM ================================================================
+
+:not_2015
+ echo "ERROR: unsupported VS version (older than VS2015)" >&2
+ EXIT /B 1
+
+REM ================================================================
+
+:print_vars
+ REM Dump the essential vars to stdout to allow the main
+ REM Makefile to include it. See config.mak.uname.
+ REM Include DOS-style and BASH-style path for bin dir.
+
+ echo msvc_bin_dir=%msvc_bin_dir%
+ SET X1=%msvc_bin_dir:C:=/C%
+ SET X2=%X1:\=/%
+ echo msvc_bin_dir_msys=%X2%
+
+ echo msvc_includes=%msvc_includes%
+ echo msvc_libs=%msvc_libs%
+
+ echo sdk_includes=%sdk_includes%
+ echo sdk_libs=%sdk_libs%
+
+ echo vs_ver=%vs_ver%
+
+ EXIT /B 0
use strict;
my @args = ();
my @cflags = ();
+my @lflags = ();
my $is_linking = 0;
+my $is_debug = 0;
while (@ARGV) {
my $arg = shift @ARGV;
- if ("$arg" =~ /^-[DIMGO]/) {
+ if ("$arg" eq "-DDEBUG") {
+ # Some vcpkg-based libraries have different names for release
+ # and debug versions. This hack assumes that -DDEBUG comes
+ # before any "-l*" flags.
+ $is_debug = 1;
+ }
+ if ("$arg" =~ /^-[DIMGOZ]/) {
push(@cflags, $arg);
} elsif ("$arg" eq "-o") {
my $file_out = shift @ARGV;
if ("$file_out" =~ /exe$/) {
$is_linking = 1;
+ # Create foo.exe and foo.pdb
push(@args, "-OUT:$file_out");
} else {
+ # Create foo.o and foo.o.pdb
push(@args, "-Fo$file_out");
+ push(@args, "-Fd$file_out.pdb");
}
} elsif ("$arg" eq "-lz") {
+ if ($is_debug) {
+ push(@args, "zlibd.lib");
+ } else{
push(@args, "zlib.lib");
+ }
} elsif ("$arg" eq "-liconv") {
- push(@args, "iconv.lib");
+ push(@args, "libiconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libeay32.lib");
} elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib");
} elsif ("$arg" eq "-lcurl") {
- push(@args, "libcurl.lib");
+ my $lib = "";
+ # Newer vcpkg definitions call this libcurl_imp.lib; Do we
+ # need to use that instead?
+ foreach my $flag (@lflags) {
+ if ($flag =~ /^-LIBPATH:(.*)/) {
+ foreach my $l ("libcurl_imp.lib", "libcurl.lib") {
+ if (-f "$1/$l") {
+ $lib = $l;
+ last;
+ }
+ }
+ }
+ }
+ push(@args, $lib);
+ } elsif ("$arg" eq "-lexpat") {
+ push(@args, "expat.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/;
- push(@args, $arg);
+ push(@lflags, $arg);
} elsif ("$arg" =~ /^-R/) {
# eat
} else {
}
}
if ($is_linking) {
+ push(@args, @lflags);
unshift(@args, "link.exe");
} else {
unshift(@args, "cl.exe");
push(@args, @cflags);
}
-#printf("**** @args\n");
+printf(STDERR "**** @args\n\n\n") if (!defined($ENV{'QUIET_GEN'}));
exit (system(@args) != 0);
--- /dev/null
+@ECHO OFF
+REM ================================================================
+REM This script is an optional step. It copies the *.dll and *.pdb
+REM files (created by vcpkg_install.bat) into the top-level directory
+REM of the repo so that you can type "./git.exe" and find them without
+REM having to fixup your PATH.
+REM
+REM NOTE: Because the names of some DLL files change between DEBUG and
+REM NOTE: RELEASE builds when built using "vcpkg.exe", you will need
+REM NOTE: to copy up the corresponding version.
+REM ================================================================
+
+ SETLOCAL EnableDelayedExpansion
+
+ @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
+ cd %cwd%
+
+ SET arch=x64-windows
+ SET inst=%cwd%vcpkg\installed\%arch%
+
+ IF [%1]==[release] (
+ echo Copying RELEASE mode DLLs to repo root...
+ ) ELSE IF [%1]==[debug] (
+ SET inst=%inst%\debug
+ echo Copying DEBUG mode DLLs to repo root...
+ ) ELSE (
+ echo ERROR: Invalid argument.
+ echo Usage: %~0 release
+ echo Usage: %~0 debug
+ EXIT /B 1
+ )
+
+ xcopy /e/s/v/y %inst%\bin\*.dll ..\..\
+ xcopy /e/s/v/y %inst%\bin\*.pdb ..\..\
+
+ xcopy /e/s/v/y %inst%\bin\*.dll ..\..\t\helper\
+ xcopy /e/s/v/y %inst%\bin\*.pdb ..\..\t\helper\
+
+ EXIT /B 0
--- /dev/null
+@ECHO OFF
+REM ================================================================
+REM This script installs the "vcpkg" source package manager and uses
+REM it to build the third-party libraries that git requires when it
+REM is built using MSVC.
+REM
+REM [1] Install VCPKG.
+REM [a] Create <root>/compat/vcbuild/vcpkg/
+REM [b] Download "vcpkg".
+REM [c] Compile using the currently installed version of VS.
+REM [d] Create <root>/compat/vcbuild/vcpkg/vcpkg.exe
+REM
+REM [2] Install third-party libraries.
+REM [a] Download each (which may also install CMAKE).
+REM [b] Compile in RELEASE mode and install in:
+REM vcpkg/installed/<arch>/{bin,lib}
+REM [c] Compile in DEBUG mode and install in:
+REM vcpkg/installed/<arch>/debug/{bin,lib}
+REM [d] Install headers in:
+REM vcpkg/installed/<arch>/include
+REM
+REM [3] Create a set of MAKE definitions for the top-level
+REM Makefile to allow "make MSVC=1" to find the above
+REM third-party libraries.
+REM [a] Write vcpkg/VCPGK-DEFS
+REM
+REM https://blogs.msdn.microsoft.com/vcblog/2016/09/19/vcpkg-a-tool-to-acquire-and-build-c-open-source-libraries-on-windows/
+REM https://github.com/Microsoft/vcpkg
+REM https://vcpkg.readthedocs.io/en/latest/
+REM ================================================================
+
+ SETLOCAL EnableDelayedExpansion
+
+ @FOR /F "delims=" %%D IN ("%~dp0") DO @SET cwd=%%~fD
+ cd %cwd%
+
+ dir vcpkg\vcpkg.exe >nul 2>nul && GOTO :install_libraries
+
+ echo Fetching vcpkg in %cwd%vcpkg
+ git.exe clone https://github.com/Microsoft/vcpkg vcpkg
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ cd vcpkg
+ echo Building vcpkg
+ powershell -exec bypass scripts\bootstrap.ps1
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ echo Successfully installed %cwd%vcpkg\vcpkg.exe
+
+:install_libraries
+ SET arch=x64-windows
+
+ echo Installing third-party libraries...
+ FOR %%i IN (zlib expat libiconv openssl libssh2 curl) DO (
+ cd %cwd%vcpkg
+ IF NOT EXIST "packages\%%i_%arch%" CALL :sub__install_one %%i
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+ )
+
+:install_defines
+ cd %cwd%
+ SET inst=%cwd%vcpkg\installed\%arch%
+
+ echo vcpkg_inc=-I"%inst%\include">VCPKG-DEFS
+ echo vcpkg_rel_lib=-L"%inst%\lib">>VCPKG-DEFS
+ echo vcpkg_rel_bin="%inst%\bin">>VCPKG-DEFS
+ echo vcpkg_dbg_lib=-L"%inst%\debug\lib">>VCPKG-DEFS
+ echo vcpkg_dbg_bin="%inst%\debug\bin">>VCPKG-DEFS
+
+ EXIT /B 0
+
+
+:sub__install_one
+ echo Installing package %1...
+
+ .\vcpkg.exe install %1:%arch%
+ IF ERRORLEVEL 1 ( EXIT /B 1 )
+
+ echo Finished %1
+ goto :EOF
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity type="win32" name="Git" version="0.0.0.1" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
+</assembly>
DWORD tid;
} pthread_t;
-extern int pthread_create(pthread_t *thread, const void *unused,
+int pthread_create(pthread_t *thread, const void *unused,
void *(*start_routine)(void*), void *arg);
/*
*/
#define pthread_join(a, b) win32_pthread_join(&(a), (b))
-extern int win32_pthread_join(pthread_t *thread, void **value_ptr);
+int win32_pthread_join(pthread_t *thread, void **value_ptr);
#define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
-extern pthread_t pthread_self(void);
+pthread_t pthread_self(void);
static inline void NORETURN pthread_exit(void *ret)
{
#ifdef DETECT_MSYS_TTY
#include <winternl.h>
+
+#if defined(_MSC_VER)
+
+typedef struct _OBJECT_NAME_INFORMATION
+{
+ UNICODE_STRING Name;
+ WCHAR NameBuffer[0];
+} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
+
+#define ObjectNameInformation 1
+
+#else
#include <ntstatus.h>
+#endif
static void detect_msys_tty(int fd)
{
void winansi_init(void)
{
int con1, con2;
- char name[32];
+ wchar_t name[32];
/* check if either stdout or stderr is a console output screen buffer */
con1 = is_console(1);
}
/* create a named pipe to communicate with the console thread */
- xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId());
- hwrite = CreateNamedPipe(name, PIPE_ACCESS_OUTBOUND,
+ if (swprintf(name, ARRAY_SIZE(name) - 1, L"\\\\.\\pipe\\winansi%lu",
+ GetCurrentProcessId()) < 0)
+ die("Could not initialize winansi pipe name");
+ hwrite = CreateNamedPipeW(name, PIPE_ACCESS_OUTBOUND,
PIPE_TYPE_BYTE | PIPE_WAIT, 1, BUFFER_SIZE, 0, 0, NULL);
if (hwrite == INVALID_HANDLE_VALUE)
die_lasterr("CreateNamedPipe failed");
- hread = CreateFile(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
+ hread = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
if (hread == INVALID_HANDLE_VALUE)
die_lasterr("CreateFile for named pipe failed");
#include "utf8.h"
#include "dir.h"
#include "color.h"
+#include "refs.h"
struct config_source {
struct config_source *prev;
return ret;
}
+static void add_trailing_starstar_for_dir(struct strbuf *pat)
+{
+ if (pat->len && is_dir_sep(pat->buf[pat->len - 1]))
+ strbuf_addstr(pat, "**");
+}
+
static int prepare_include_condition_pattern(struct strbuf *pat)
{
struct strbuf path = STRBUF_INIT;
} else if (!is_absolute_path(pat->buf))
strbuf_insert(pat, 0, "**/", 3);
- if (pat->len && is_dir_sep(pat->buf[pat->len - 1]))
- strbuf_addstr(pat, "**");
+ add_trailing_starstar_for_dir(pat);
strbuf_release(&path);
return prefix;
return ret;
}
+static int include_by_branch(const char *cond, size_t cond_len)
+{
+ int flags;
+ int ret;
+ struct strbuf pattern = STRBUF_INIT;
+ const char *refname = !the_repository->gitdir ?
+ NULL : resolve_ref_unsafe("HEAD", 0, NULL, &flags);
+ const char *shortname;
+
+ if (!refname || !(flags & REF_ISSYMREF) ||
+ !skip_prefix(refname, "refs/heads/", &shortname))
+ return 0;
+
+ strbuf_add(&pattern, cond, cond_len);
+ add_trailing_starstar_for_dir(&pattern);
+ ret = !wildmatch(pattern.buf, shortname, WM_PATHNAME);
+ strbuf_release(&pattern);
+ return ret;
+}
+
static int include_condition_is_true(const struct config_options *opts,
const char *cond, size_t cond_len)
{
return include_by_gitdir(opts, cond, cond_len, 0);
else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
return include_by_gitdir(opts, cond, cond_len, 1);
+ else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
+ return include_by_branch(cond, cond_len);
/* unknown conditionals are always false */
return 0;
NORETURN
static void die_bad_number(const char *name, const char *value)
{
- const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
+ const char *error_type = (errno == ERANGE) ?
+ N_("out of range") : N_("invalid unit");
+ const char *bad_numeric = N_("bad numeric config value '%s' for '%s': %s");
if (!value)
value = "";
+ if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
+ /*
+ * We explicitly *don't* use _() here since it would
+ * cause an infinite loop with _() needing to call
+ * use_gettext_poison(). This is why marked up
+ * translations with N_() above.
+ */
+ die(bad_numeric, value, name, error_type);
+
if (!(cf && cf->name))
- die(_("bad numeric config value '%s' for '%s': %s"),
- value, name, error_type);
+ die(_(bad_numeric), value, name, _(error_type));
switch (cf->origin_type) {
case CONFIG_ORIGIN_BLOB:
die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_FILE:
die(_("bad numeric config value '%s' for '%s' in file %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_STDIN:
die(_("bad numeric config value '%s' for '%s' in standard input: %s"),
- value, name, error_type);
+ value, name, _(error_type));
case CONFIG_ORIGIN_SUBMODULE_BLOB:
die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
case CONFIG_ORIGIN_CMDLINE:
die(_("bad numeric config value '%s' for '%s' in command line %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
default:
die(_("bad numeric config value '%s' for '%s' in %s: %s"),
- value, name, cf->name, error_type);
+ value, name, cf->name, _(error_type));
}
}
return 0;
}
- if (!strcmp(var, "core.partialclonefilter")) {
- return git_config_string(&core_partial_clone_filter_default,
- var, value);
- }
-
if (!strcmp(var, "core.usereplacerefs")) {
read_replace_refs = git_config_bool(var, value);
return 0;
return -1; /* thing exists but cannot be parsed */
}
-int git_config_get_untracked_cache(void)
-{
- int val = -1;
- const char *v;
-
- /* Hack for test programs like test-dump-untracked-cache */
- if (ignore_untracked_cache_config)
- return -1;
-
- if (!git_config_get_maybe_bool("core.untrackedcache", &val))
- return val;
-
- if (!git_config_get_value("core.untrackedcache", &v)) {
- if (!strcasecmp(v, "keep"))
- return -1;
-
- error(_("unknown core.untrackedCache value '%s'; "
- "using 'keep' default value"), v);
- return -1;
- }
-
- return -1; /* default value */
-}
-
int git_config_get_split_index(void)
{
int val;
# Platform specific Makefile tweaks based on uname detection
+# Define NO_SAFESEH if you need MSVC/Visual Studio to ignore the lack of
+# Microsoft's Safe Exception Handling in libraries (such as zlib).
+# Typically required for VS2013+/32-bit compilation on Vista+ versions.
+
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
# avoid the MingW and Cygwin configuration sections
uname_S := Windows
uname_O := Windows
+
+ # Generate and include makefile variables that point to the
+ # currently installed set of MSVC command line tools.
+compat/vcbuild/MSVC-DEFS-GEN: compat/vcbuild/find_vs_env.bat
+ @"$<" | tr '\\' / >"$@"
+include compat/vcbuild/MSVC-DEFS-GEN
+
+ # See if vcpkg and the vcpkg-build versions of the third-party
+ # libraries that we use are installed. We include the result
+ # to get $(vcpkg_*) variables defined for the Makefile.
+ifeq (,$(SKIP_VCPKG))
+compat/vcbuild/VCPKG-DEFS: compat/vcbuild/vcpkg_install.bat
+ @"$<"
+include compat/vcbuild/VCPKG-DEFS
+endif
endif
# We choose to avoid "if .. else if .. else .. endif endif"
ifeq ($(uname_S),Windows)
GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ;
+ # Assume that this is built in Git for Windows' SDK
+ ifeq (MINGW32,$(MSYSTEM))
+ prefix = /mingw32
+ else
+ prefix = /mingw64
+ endif
+ # Prepend MSVC 64-bit tool-chain to PATH.
+ #
+ # A regular Git Bash *does not* have cl.exe in its $PATH. As there is a
+ # link.exe next to, and required by, cl.exe, we have to prepend this
+ # onto the existing $PATH.
+ #
+ SANE_TOOL_PATH ?= $(msvc_bin_dir_msys)
HAVE_ALLOCA_H = YesPlease
NO_PREAD = YesPlease
NEEDS_CRYPTO_WITH_SSL = YesPlease
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
NO_MEMMEM = YesPlease
- # NEEDS_LIBICONV = YesPlease
- NO_ICONV = YesPlease
+ NEEDS_LIBICONV = YesPlease
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
- SNPRINTF_RETURNS_BOGUS = YesPlease
+ NO_INTTYPES_H = YesPlease
+ # VS2015 with UCRT claims that snprintf and friends are C99 compliant,
+ # so we don't need this:
+ #
+ # SNPRINTF_RETURNS_BOGUS = YesPlease
NO_SVN_TESTS = YesPlease
RUNTIME_PREFIX = YesPlease
HAVE_WPGMPTR = YesWeDo
NO_REGEX = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
- BLK_SHA1 = YesPlease
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
NATIVE_CRLF = YesPlease
CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl
CFLAGS =
- BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
+ BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/trace2_win32_process_info.o \
compat/win32/dirent.o
- COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
- BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
- EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
+ COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
+ BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
+ # invalidcontinue.obj allows Git's source code to close the same file
+ # handle twice, or to access the osfhandle of an already-closed stdout
+ # See https://msdn.microsoft.com/en-us/library/ms235330.aspx
+ EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
PTHREAD_LIBS =
lib =
+ BASIC_CFLAGS += $(vcpkg_inc) $(sdk_includes) $(msvc_includes)
+ifndef DEBUG
+ BASIC_CFLAGS += $(vcpkg_rel_lib)
+else
+ BASIC_CFLAGS += $(vcpkg_dbg_lib)
+endif
+ BASIC_CFLAGS += $(sdk_libs) $(msvc_libs)
+
+ifneq ($(USE_MSVC_CRTDBG),)
+ # Optionally enable memory leak reporting.
+ BASIC_CFLAGS += -DUSE_MSVC_CRTDBG
+endif
BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
+ # Always give "-Zi" to the compiler and "-debug" to linker (even in
+ # release mode) to force a PDB to be generated (like RelWithDebInfo).
+ BASIC_CFLAGS += -Zi
+ BASIC_LDFLAGS += -debug -Zf
+
+ifdef NO_SAFESEH
+ LDFLAGS += -SAFESEH:NO
+endif
+
ifndef DEBUG
- BASIC_CFLAGS += -GL -Os -MD
- BASIC_LDFLAGS += -LTCG
+ BASIC_CFLAGS += -GL -Gy -O2 -Oy- -MD -DNDEBUG
+ BASIC_LDFLAGS += -release -LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:CV,FIXUP
AR += -LTCG
else
- BASIC_CFLAGS += -Zi -MDd
+ BASIC_CFLAGS += -MDd -DDEBUG -D_DEBUG
endif
X = .exe
+
+compat/msvc.o: compat/msvc.c compat/mingw.c GIT-CFLAGS
endif
ifeq ($(uname_S),Interix)
NO_INITGROUPS = YesPlease
ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
+ BASIC_LDFLAGS += -municode
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease
- COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
+ COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
else
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
# MSys2
BASIC_LDFLAGS += -Wl,--large-address-aware
endif
CC = gcc
- COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY
+ COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
+ -fstack-protector-strong
EXTLIBS += -lntdll
INSTALL = /bin/install
NO_R_TO_GCC_LINKER = YesPlease
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
endif
+
+vcxproj:
+ # Require clean work tree
+ git update-index -q --refresh && \
+ git diff-files --quiet && \
+ git diff-index --cached --quiet HEAD --
+
+ # Make .vcxproj files and add them
+ unset QUIET_GEN QUIET_BUILT_IN; \
+ perl contrib/buildsystems/generate -g Vcxproj
+ git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
+
+ # Generate the LinkOrCopyBuiltins.targets file
+ (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
+ echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
+ for name in $(BUILT_INS);\
+ do \
+ echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
+ done && \
+ for name in $(REMOTE_CURL_ALIASES); \
+ do \
+ echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
+ done && \
+ echo ' </Target>' && \
+ echo '</Project>') >git/LinkOrCopyBuiltins.targets
+ git add -f git/LinkOrCopyBuiltins.targets
+
+ # Add command-list.h
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h
+ git add -f command-list.h
+
+ # Add scripts
+ rm -f perl/perl.mak
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \
+ $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+ # Strip out the sane tool path, needed only for building
+ sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
+ git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
+
+ # Add Perl module
+ $(MAKE) $(LIB_PERL_GEN)
+ git add -f perl/build
+
+ # Add bin-wrappers, for testing
+ rm -rf bin-wrappers/
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(test_bindir_programs)
+ # Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
+ # path of the repository is not hard-coded (GIT_EXEC_PATH will be set
+ # by test-lib.sh according to the current setup)
+ sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
+ \1="$$(cygpath -u "$$\1")"/' \
+ -e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
+ # Ensure that test-* helpers find the .dll files copied to top-level
+ sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
+ # We do not want to force hard-linking builtins
+ sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
+ bin-wrappers/git-{receive-pack,upload-archive}
+ git add -f $(test_bindir_programs)
+ # remote-ext is a builtin, but invoked as if it were external
+ sed 's|receive-pack|remote-ext|g' \
+ <bin-wrappers/git-receive-pack >bin-wrappers/git-remote-ext
+ git add -f bin-wrappers/git-remote-ext
+
+ # Add templates
+ $(MAKE) -C templates
+ git add -f templates/boilerplates.made templates/blt/
+
+ # Add build options
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
+ git add -f GIT-BUILD-OPTIONS
+
+ # Commit the whole shebang
+ git commit -m "Generate Visual Studio solution" \
+ -m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"
if test "$git_cv_ld_rpath" = "yes"; then
CC_LD_DYNPATH=-rpath
else
- CC_LD_DYNPATH=
- AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
+ AC_CACHE_CHECK([if linker supports -Wl,+b,], git_cv_ld_wl_b, [
+ SAVE_LDFLAGS="${LDFLAGS}"
+ LDFLAGS="${SAVE_LDFLAGS} -Wl,+b,/"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_b=yes], [git_cv_ld_wl_b=no])
+ LDFLAGS="${SAVE_LDFLAGS}"
+ ])
+ if test "$git_cv_ld_wl_b" = "yes"; then
+ CC_LD_DYNPATH=-Wl,+b,
+ else
+ CC_LD_DYNPATH=
+ AC_MSG_WARN([linker does not support runtime path to dynamic libraries])
+ fi
fi
fi
fi
#include "connected.h"
#include "transport.h"
#include "packfile.h"
+#include "promisor-remote.h"
/*
* If we feed all the commits we want to verify to this command
argv_array_push(&rev_list.args,"rev-list");
argv_array_push(&rev_list.args, "--objects");
argv_array_push(&rev_list.args, "--stdin");
- if (repository_format_partial_clone)
+ if (has_promisor_remote())
argv_array_push(&rev_list.args, "--exclude-promisor-objects");
if (!opt->is_deepening_fetch) {
argv_array_push(&rev_list.args, "--not");
argv_array_push(&rev_list.args, "--all");
}
argv_array_push(&rev_list.args, "--quiet");
+ argv_array_push(&rev_list.args, "--alternate-refs");
if (opt->progress)
argv_array_pushf(&rev_list.args, "--progress=%s",
_("Checking connectivity"));
$me = dirname($me);
if (opendir(D,"$me/Generators")) {
foreach my $gen (readdir(D)) {
- next if ($gen =~ /^\.\.?$/);
+ next unless ($gen =~ /\.pm$/);
require "${me}/Generators/$gen";
$gen =~ s,\.pm,,;
push(@AVAILABLE, $gen);
use strict;
use vars qw($VERSION);
+use Digest::SHA qw(sha256_hex);
our $VERSION = '1.00';
our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE);
push @EXPORT_OK, qw(generate);
}
-my $guid_index = 0;
-my @GUIDS = (
- "{E07B9989-2BF7-4F21-8918-BE22BA467AC3}",
- "{278FFB51-0296-4A44-A81A-22B87B7C3592}",
- "{7346A2C4-F0FD-444F-9EBE-1AF23B2B5650}",
- "{67F421AC-EB34-4D49-820B-3196807B423F}",
- "{385DCFE1-CC8C-4211-A451-80FCFC31CA51}",
- "{97CC46C5-D2CC-4D26-B634-E75792B79916}",
- "{C7CE21FE-6EF8-4012-A5C7-A22BCEDFBA11}",
- "{51575134-3FDF-42D1-BABD-3FB12669C6C9}",
- "{0AE195E4-9823-4B87-8E6F-20C5614AF2FF}",
- "{4B918255-67CA-43BB-A46C-26704B666E6B}",
- "{18CCFEEF-C8EE-4CC1-A265-26F95C9F4649}",
- "{5D5D90FA-01B7-4973-AFE5-CA88C53AC197}",
- "{1F054320-036D-49E1-B384-FB5DF0BC8AC0}",
- "{7CED65EE-F2D9-4171-825B-C7D561FE5786}",
- "{8D341679-0F07-4664-9A56-3BA0DE88B9BC}",
- "{C189FEDC-2957-4BD7-9FA4-7622241EA145}",
- "{66844203-1B9F-4C53-9274-164FFF95B847}",
- "{E4FEA145-DECC-440D-AEEA-598CF381FD43}",
- "{73300A8E-C8AC-41B0-B555-4F596B681BA7}",
- "{873FDEB1-D01D-40BF-A1BF-8BBC58EC0F51}",
- "{7922C8BE-76C5-4AC6-8BF7-885C0F93B782}",
- "{E245D370-308B-4A49-BFC1-1E527827975F}",
- "{F6FA957B-66FC-4ED7-B260-E59BBE4FE813}",
- "{E6055070-0198-431A-BC49-8DB6CEE770AE}",
- "{54159234-C3EB-43DA-906B-CE5DA5C74654}",
- "{594CFC35-0B60-46F6-B8EF-9983ACC1187D}",
- "{D93FCAB7-1F01-48D2-B832-F761B83231A5}",
- "{DBA5E6AC-E7BE-42D3-8703-4E787141526E}",
- "{6171953F-DD26-44C7-A3BE-CC45F86FC11F}",
- "{9E19DDBE-F5E4-4A26-A2FE-0616E04879B8}",
- "{AE81A615-99E3-4885-9CE0-D9CAA193E867}",
- "{FBF4067E-1855-4F6C-8BCD-4D62E801A04D}",
- "{17007948-6593-4AEB-8106-F7884B4F2C19}",
- "{199D4C8D-8639-4DA6-82EF-08668C35DEE0}",
- "{E085E50E-C140-4CF3-BE4B-094B14F0DDD6}",
- "{00785268-A9CC-4E40-AC29-BAC0019159CE}",
- "{4C06F56A-DCDB-46A6-B67C-02339935CF12}",
- "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}",
- "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}",
- "{9392EB58-D7BA-410B-B1F0-B2FAA6BC89A7}",
- "{2ACAB2D5-E0CE-4027-BCA0-D78B2D7A6C66}",
- "{86E216C3-43CE-481A-BCB2-BE5E62850635}",
- "{FB631291-7923-4B91-9A57-7B18FDBB7A42}",
- "{0A176EC9-E934-45B8-B87F-16C7F4C80039}",
- "{DF55CA80-46E8-4C53-B65B-4990A23DD444}",
- "{3A0F9895-55D2-4710-BE5E-AD7498B5BF44}",
- "{294BDC5A-F448-48B6-8110-DD0A81820F8C}",
- "{4B9F66E9-FAC9-47AB-B1EF-C16756FBFD06}",
- "{72EA49C6-2806-48BD-B81B-D4905102E19C}",
- "{5728EB7E-8929-486C-8CD5-3238D060E768}"
-);
+sub generate_guid ($) {
+ my $hex = sha256_hex($_[0]);
+ $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/;
+ $hex =~ tr/a-z/A-Z/;
+ return $hex;
+}
sub generate {
my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
$target =~ s/\//_/g;
$target =~ s/\.a//;
- my $uuid = $GUIDS[$guid_index];
+ my $uuid = generate_guid($libname);
$$build_structure{"LIBS_${target}_GUID"} = $uuid;
- $guid_index += 1;
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"LIBS_${libname}_SOURCES"}}));
my @sources;
my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"LIBS_${libname}_INCLUDES"}})));
my $cflags = join(" ", sort(@{$$build_structure{"LIBS_${libname}_CFLAGS"}}));
$cflags =~ s/\"/"/g;
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
my $cflags_debug = $cflags;
$cflags_debug =~ s/-MT/-MTd/;
$defines =~ s/-D//g;
$defines =~ s/\"/\\"/g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
$defines =~ s/\'//g;
$includes =~ s/-I//g;
mkdir "$target" || die "Could not create the directory $target for lib project!\n";
<Tool
Name="VCXMLDataGeneratorTool"
/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
<Tool
Name="VCMIDLTool"
/>
$target =~ s/\//_/g;
$target =~ s/\.exe//;
- my $uuid = $GUIDS[$guid_index];
+ my $uuid = generate_guid($appname);
$$build_structure{"APPS_${target}_GUID"} = $uuid;
- $guid_index += 1;
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"APPS_${appname}_SOURCES"}}));
my @sources;
my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"APPS_${appname}_INCLUDES"}})));
my $cflags = join(" ", sort(@{$$build_structure{"APPS_${appname}_CFLAGS"}}));
$cflags =~ s/\"/"/g;
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
my $cflags_debug = $cflags;
$cflags_debug =~ s/-MT/-MTd/;
$defines =~ s/-D//g;
$defines =~ s/\"/\\"/g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
$defines =~ s/\'//g;
$defines =~ s/\\\\/\\/g;
$includes =~ s/-I//g;
<Tool
Name="VCXMLDataGeneratorTool"
/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
<Tool
Name="VCMIDLTool"
/>
foreach (@apps) {
$_ =~ s/\//_/g;
$_ =~ s/\.exe//;
- push(@tmp, $_);
+ if ($_ eq "git" ) {
+ unshift(@tmp, $_);
+ } else {
+ push(@tmp, $_);
+ }
}
@apps = @tmp;
open F, ">git.sln" || die "Could not open git.sln for writing!\n";
binmode F, ":crlf";
print F "$SLN_HEAD";
- foreach (@libs) {
- my $libname = $_;
- my $uuid = $build_structure{"LIBS_${libname}_GUID"};
- print F "$SLN_PRE";
- print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\"";
- print F "$SLN_POST";
- }
+
my $uuid_libgit = $build_structure{"LIBS_libgit_GUID"};
my $uuid_xdiff_lib = $build_structure{"LIBS_xdiff_lib_GUID"};
foreach (@apps) {
print F " EndProjectSection";
print F "$SLN_POST";
}
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "$SLN_PRE";
+ print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
print F << "EOM";
Global
print F << "EOM";
GlobalSection(ProjectConfigurationPlatforms) = postSolution
EOM
- foreach (@libs) {
- my $libname = $_;
- my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n";
print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n";
print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n";
print F "\t\t${uuid}.Release|Win32.Build.0 = Release|Win32\n";
}
- foreach (@apps) {
- my $appname = $_;
- my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n";
print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n";
print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n";
--- /dev/null
+package Generators::Vcxproj;
+require Exporter;
+
+use strict;
+use vars qw($VERSION);
+use Digest::SHA qw(sha256_hex);
+
+our $VERSION = '1.00';
+our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE);
+@ISA = qw(Exporter);
+
+BEGIN {
+ push @EXPORT_OK, qw(generate);
+}
+
+sub generate_guid ($) {
+ my $hex = sha256_hex($_[0]);
+ $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/;
+ $hex =~ tr/a-z/A-Z/;
+ return $hex;
+}
+
+sub generate {
+ my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
+ my @libs = @{$build_structure{"LIBS"}};
+ foreach (@libs) {
+ createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 1);
+ }
+
+ my @apps = @{$build_structure{"APPS"}};
+ foreach (@apps) {
+ createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 0);
+ }
+
+ createGlueProject($git_dir, $out_dir, $rel_dir, %build_structure);
+ return 0;
+}
+
+sub createProject {
+ my ($name, $git_dir, $out_dir, $rel_dir, $build_structure, $static_library) = @_;
+ my $label = $static_library ? "lib" : "app";
+ my $prefix = $static_library ? "LIBS_" : "APPS_";
+ my $config_type = $static_library ? "StaticLibrary" : "Application";
+ print "Generate $name vcxproj $label project\n";
+ my $cdup = $name;
+ $cdup =~ s/[^\/]+/../g;
+ $cdup =~ s/\//\\/g;
+ $rel_dir = $rel_dir eq "." ? $cdup : "$cdup\\$rel_dir";
+ $rel_dir =~ s/\//\\/g;
+
+ my $target = $name;
+ if ($static_library) {
+ $target =~ s/\.a//;
+ } else {
+ $target =~ s/\.exe//;
+ }
+
+ my $uuid = generate_guid($name);
+ $$build_structure{"$prefix${target}_GUID"} = $uuid;
+ my $vcxproj = $target;
+ $vcxproj =~ s/(.*\/)?(.*)/$&\/$2.vcxproj/;
+ $vcxproj =~ s/([^\/]*)(\/lib)\/(lib.vcxproj)/$1$2\/$1_$3/;
+ $$build_structure{"$prefix${target}_VCXPROJ"} = $vcxproj;
+
+ my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"$prefix${name}_SOURCES"}}));
+ my @sources;
+ foreach (@srcs) {
+ $_ =~ s/\//\\/g;
+ push(@sources, $_);
+ }
+ my $defines = join(";", sort(@{$$build_structure{"$prefix${name}_DEFINES"}}));
+ my $includes= join(";", sort(map { s/^-I//; s/\//\\/g; File::Spec->file_name_is_absolute($_) ? $_ : "$rel_dir\\$_" } @{$$build_structure{"$prefix${name}_INCLUDES"}}));
+ my $cflags = join(" ", sort(map { s/^-[GLMOWZ].*//; s/.* .*/"$&"/; $_; } @{$$build_structure{"$prefix${name}_CFLAGS"}}));
+ $cflags =~ s/</</g;
+ $cflags =~ s/>/>/g;
+
+ my $libs_release = "\n ";
+ my $libs_debug = "\n ";
+ if (!$static_library) {
+ $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
+ $libs_debug = $libs_release;
+ $libs_debug =~ s/zlib\.lib/zlibd\.lib/;
+ }
+
+ $defines =~ s/-D//g;
+ $defines =~ s/</</g;
+ $defines =~ s/>/>/g;
+ $defines =~ s/\'//g;
+
+ die "Could not create the directory $target for $label project!\n" unless (-d "$target" || mkdir "$target");
+
+ open F, ">$vcxproj" or die "Could not open $vcxproj for writing!\n";
+ binmode F, ":crlf :utf8";
+ print F chr(0xFEFF);
+ print F << "EOM";
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>$uuid</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch>
+ <VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch>
+ <VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory>
+ <VCPKGBinDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory>
+ <VCPKGLibDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory>
+ <VCPKGBinDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory>
+ <VCPKGLibDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory>
+ <VCPKGIncludeDirectory>\$(VCPKGArchDirectory)\\include</VCPKGIncludeDirectory>
+ <VCPKGLibs Condition="'\(Configuration)'=='Debug'">$libs_debug</VCPKGLibs>
+ <VCPKGLibs Condition="'\(Configuration)'!='Debug'">$libs_release</VCPKGLibs>
+ </PropertyGroup>
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'\$(Configuration)'=='Debug'" Label="Configuration">
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'\$(Configuration)'=='Release'" Label="Configuration">
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ConfigurationType>$config_type</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <!-- <CharacterSet>UTF-8</CharacterSet> -->
+ <OutDir>..\\</OutDir>
+ <!-- <IntDir>\$(ProjectDir)\$(Configuration)\\</IntDir> -->
+ </PropertyGroup>
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="\$(UserRootDir)\\Microsoft.Cpp.\$(Platform).user.props" Condition="exists('\$(UserRootDir)\\Microsoft.Cpp.\$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <GenerateManifest>false</GenerateManifest>
+ <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalOptions>$cflags %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalIncludeDirectories>$cdup;$cdup\\compat;$cdup\\compat\\regex;$cdup\\compat\\win32;$cdup\\compat\\poll;$cdup\\compat\\vcbuild\\include;\$(VCPKGIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <EnableParallelCodeGeneration />
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <PrecompiledHeader />
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Lib>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Link>
+ <AdditionalLibraryDirectories>\$(VCPKGLibDirectory);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
+ <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol>
+ <ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
+ <SubSystem>Console</SubSystem>
+ </Link>
+EOM
+ if ($target eq 'libgit') {
+ print F << "EOM";
+ <PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)\\include\\openssl\\ssl.h')">
+ <Message>Initialize VCPKG</Message>
+ <Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command>
+ <Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat"</Command>
+ </PreBuildEvent>
+EOM
+ }
+ print F << "EOM";
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Platform)'=='Win32'">
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Configuration)'=='Debug'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;$defines;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'\$(Configuration)'=='Release'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;$defines;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+EOM
+ foreach(@sources) {
+ print F << "EOM";
+ <ClCompile Include="$_" />
+EOM
+ }
+ print F << "EOM";
+ </ItemGroup>
+EOM
+ if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
+ my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
+ my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
+
+ print F << "EOM";
+ <ItemGroup>
+ <ProjectReference Include="$cdup\\libgit\\libgit.vcxproj">
+ <Project>$uuid_libgit</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ if (!($name =~ 'xdiff')) {
+ print F << "EOM";
+ <ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
+ <Project>$uuid_xdiff_lib</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ }
+ if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
+ my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
+ print F << "EOM";
+ <ProjectReference Include="$cdup\\vcs-svn\\lib\\vcs-svn_lib.vcxproj">
+ <Project>$uuid_vcs_svn_lib</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+EOM
+ }
+ print F << "EOM";
+ </ItemGroup>
+EOM
+ }
+ print F << "EOM";
+ <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.targets" />
+EOM
+ if (!$static_library) {
+ print F << "EOM";
+ <Target Name="${target}_AfterBuild" AfterTargets="AfterBuild">
+ <ItemGroup>
+ <DLLsAndPDBs Include="\$(VCPKGBinDirectory)\\*.dll;\$(VCPKGBinDirectory)\\*.pdb" />
+ </ItemGroup>
+ <Copy SourceFiles="@(DLLsAndPDBs)" DestinationFolder="\$(OutDir)" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
+ <MakeDir Directories="..\\templates\\blt\\branches" />
+ </Target>
+EOM
+ }
+ if ($target eq 'git') {
+ print F " <Import Project=\"LinkOrCopyBuiltins.targets\" />\n";
+ }
+ print F << "EOM";
+</Project>
+EOM
+ close F;
+}
+
+sub createGlueProject {
+ my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_;
+ print "Generate solutions file\n";
+ $rel_dir = "..\\$rel_dir";
+ $rel_dir =~ s/\//\\/g;
+ my $SLN_HEAD = "Microsoft Visual Studio Solution File, Format Version 11.00\n# Visual Studio 2010\n";
+ my $SLN_PRE = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = ";
+ my $SLN_POST = "\nEndProject\n";
+
+ my @libs = @{$build_structure{"LIBS"}};
+ my @tmp;
+ foreach (@libs) {
+ $_ =~ s/\.a//;
+ push(@tmp, $_);
+ }
+ @libs = @tmp;
+
+ my @apps = @{$build_structure{"APPS"}};
+ @tmp = ();
+ foreach (@apps) {
+ $_ =~ s/\.exe//;
+ if ($_ eq "git" ) {
+ unshift(@tmp, $_);
+ } else {
+ push(@tmp, $_);
+ }
+ }
+ @apps = @tmp;
+
+ open F, ">git.sln" || die "Could not open git.sln for writing!\n";
+ binmode F, ":crlf :utf8";
+ print F chr(0xFEFF);
+ print F "$SLN_HEAD";
+
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ print F "$SLN_PRE";
+ my $vcxproj = $build_structure{"APPS_${appname}_VCXPROJ"};
+ $vcxproj =~ s/\//\\/g;
+ $appname =~ s/.*\///;
+ print F "\"${appname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "$SLN_PRE";
+ my $vcxproj = $build_structure{"LIBS_${libname}_VCXPROJ"};
+ $vcxproj =~ s/\//\\/g;
+ $libname =~ s/\//_/g;
+ print F "\"${libname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "$SLN_POST";
+ }
+
+ print F << "EOM";
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+EOM
+ print F << "EOM";
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+EOM
+ foreach (@apps) {
+ my $appname = $_;
+ my $uuid = $build_structure{"APPS_${appname}_GUID"};
+ print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
+ print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
+ print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
+ print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
+ print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";
+ print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n";
+ }
+ foreach (@libs) {
+ my $libname = $_;
+ my $uuid = $build_structure{"LIBS_${libname}_GUID"};
+ print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
+ print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
+ print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
+ print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
+ print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
+ print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";
+ print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n";
+ }
+
+ print F << "EOM";
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
+EOM
+ close F;
+}
+
+1;
use File::Spec;
use Cwd;
use Generators;
+use Text::ParseWords;
my (%build_structure, %compile_options, @makedry);
my $out_dir = getcwd();
-g <GENERATOR> --gen <GENERATOR> Specify the buildsystem generator (default: $gen)
Available: $genlist
-o <PATH> --out <PATH> Specify output directory generation (default: .)
+ --make-out <PATH> Write the output of GNU Make into a file
-i <FILE> --in <FILE> Specify input file, instead of running GNU Make
-h,-? --help This help
EOM
}
# Parse command-line options
+my $make_out;
while (@ARGV) {
my $arg = shift @ARGV;
if ("$arg" eq "-h" || "$arg" eq "--help" || "$arg" eq "-?") {
exit(0);
} elsif("$arg" eq "--out" || "$arg" eq "-o") {
$out_dir = shift @ARGV;
+ } elsif("$arg" eq "--make-out") {
+ $make_out = shift @ARGV;
} elsif("$arg" eq "--gen" || "$arg" eq "-g") {
$gen = shift @ARGV;
} elsif("$arg" eq "--in" || "$arg" eq "-i") {
open(F, "<$infile") || die "Couldn't open file $infile";
@makedry = <F>;
close(F);
+ } else {
+ die "Unknown option: " . $arg;
}
}
EOM
# Pipe a make --dry-run into a variable, if not already loaded from file
-@makedry = `cd $git_dir && make -n MSVC=1 V=1 2>/dev/null` if !@makedry;
+# Capture the make dry stderr to file for review (will be empty for a release build).
+
+my $ErrsFile = "msvc-build-makedryerrors.txt";
+@makedry = `make -C $git_dir -n MSVC=1 SKIP_VCPKG=1 V=1 2>$ErrsFile`
+if !@makedry;
+# test for an empty Errors file and remove it
+unlink $ErrsFile if -f -z $ErrsFile;
+
+if (defined $make_out) {
+ open OUT, ">" . $make_out;
+ print OUT @makedry;
+ close OUT;
+}
# Parse the make output into usable info
parseMakeOutput();
next;
}
+ if ($text =~ /^(mkdir|msgfmt) /) {
+ # options to the Portable Object translations
+ # the line "mkdir ... && msgfmt ..." contains no linker options
+ next;
+ }
+
if($text =~ / -c /) {
# compilation
handleCompileLine($text, $line);
sub handleCompileLine
{
my ($line, $lineno) = @_;
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
my $sourcefile;
shift(@parts); # ignore cmd
while (my $part = shift @parts) {
my (@objfiles, @lflags, $libout, $part);
# kill cmd and rm 'prefix'
$line =~ s/^rm -f .* && .* rcs //;
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
while ($part = shift @parts) {
if ($part =~ /^-/) {
push(@lflags, $part);
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
{
my ($line, $lineno) = @_;
my (@objfiles, @lflags, @libs, $appout, $part);
- my @parts = split(' ', $line);
+ my @parts = shellwords($line);
shift(@parts); # ignore cmd
while ($part = shift @parts) {
if ($part =~ /^-IGNORE/) {
$appout = shift @parts;
} elsif ("$part" eq "-lz") {
push(@libs, "zlib.lib");
- } elsif ("$part" eq "-lcrypto") {
+ } elsif ("$part" eq "-lcrypto") {
push(@libs, "libeay32.lib");
} elsif ("$part" eq "-lssl") {
push(@libs, "ssleay32.lib");
- } elsif ($part =~ /^-/) {
+ } elsif ("$part" eq "-lcurl") {
+ push(@libs, "libcurl.lib");
+ } elsif ("$part" eq "-lexpat") {
+ push(@libs, "expat.lib");
+ } elsif ("$part" eq "-liconv") {
+ push(@libs, "libiconv.lib");
+ } elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
$part =~ s/\.a$/.lib/;
push(@libs, $part);
- } elsif ($part =~ /\.(o|obj)$/) {
+ } elsif ($part eq 'invalidcontinue.obj') {
+ # ignore - known to MSVC
+ } elsif ($part =~ /\.o$/) {
push(@objfiles, $part);
+ } elsif ($part =~ /\.obj$/) {
+ # do nothing, 'make' should not be producing .obj, only .o files
} else {
- die "Unhandled lib option @ line $lineno: $part";
+ die "Unhandled link option @ line $lineno: $part";
}
}
# print "AppOut: '$appout'\nLFlags: @lflags\nLibs : @libs\nOfiles: @objfiles\n";
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
# GIT_COMPLETION_CHECKOUT_NO_GUESS
#
# When set to "1", do not include "DWIM" suggestions in git-checkout
-# completion (e.g., completing "foo" when "origin/foo" exists).
+# and git-switch completion (e.g., completing "foo" when "origin/foo"
+# exists).
case "$COMP_WORDBREAKS" in
*:*) : great ;;
c="$c${4-}"
if [[ $c == "$cur_"* ]]; then
case $c in
- --*=*|*.) ;;
+ --*=|*.) ;;
*) c="$c " ;;
esac
COMPREPLY[i++]="${2-}$c"
c="$c${4-}"
if [[ $c == "$cur_"* ]]; then
case $c in
- --*=*|*.) ;;
+ *=|*.) ;;
*) c="$c " ;;
esac
COMPREPLY[i++]="${2-}$c"
# Even when a directory name itself does not contain
# any special characters, it will still be quoted if
# any of its (stripped) trailing path components do.
- # Because of this we may have seen the same direcory
+ # Because of this we may have seen the same directory
# both quoted and unquoted.
if (p in paths)
# We have seen the same directory unquoted,
_git_clone ()
{
+ case "$prev" in
+ -c|--config)
+ __git_complete_config_variable_name_and_value
+ return
+ ;;
+ esac
case "$cur" in
+ --config=*)
+ __git_complete_config_variable_name_and_value \
+ --cur="${cur##--config=}"
+ return
+ ;;
--*)
__gitcomp_builtin clone
return
__git_complete_index_file "$complete_opt"
}
+_git_switch ()
+{
+ case "$cur" in
+ --conflict=*)
+ __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ ;;
+ --*)
+ __gitcomp_builtin switch
+ ;;
+ *)
+ # check if --track, --no-track, or --no-guess was specified
+ # if so, disable DWIM mode
+ local track_opt="--track" only_local_ref=n
+ if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+ [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
+ track_opt=''
+ fi
+ # explicit --guess enables DWIM mode regardless of
+ # $GIT_COMPLETION_CHECKOUT_NO_GUESS
+ if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
+ track_opt='--track'
+ fi
+ if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
+ only_local_ref=y
+ else
+ # --guess --detach is invalid combination, no
+ # dwim will be done when --detach is specified
+ track_opt=
+ fi
+ if [ $only_local_ref = y -a -z "$track_opt" ]; then
+ __gitcomp_direct "$(__git_heads "" "$cur" " ")"
+ else
+ __git_complete_refs $track_opt
+ fi
+ ;;
+ esac
+}
+
__git_config_get_set_variables ()
{
local prevword word config_file= c=$cword
__git_compute_config_vars ()
{
test -n "$__git_config_vars" ||
- __git_config_vars="$(git help --config-for-completion | sort | uniq)"
+ __git_config_vars="$(git help --config-for-completion | sort -u)"
}
-_git_config ()
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+# to be completed. Defaults to the previous word on the
+# command line.
+# --cur=<word>: The current value to be completed. Defaults to the current
+# word to be completed.
+__git_complete_config_variable_value ()
{
- local varname
+ local varname="$prev" cur_="$cur"
+
+ while test $# != 0; do
+ case "$1" in
+ --varname=*) varname="${1##--varname=}" ;;
+ --cur=*) cur_="${1##--cur=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
- varname="${prev,,}"
+ varname="${varname,,}"
else
- varname="$(echo "$prev" |tr A-Z a-z)"
+ varname="$(echo "$varname" |tr A-Z a-z)"
fi
case "$varname" in
branch.*.remote|branch.*.pushremote)
- __gitcomp_nl "$(__git_remotes)"
+ __gitcomp_nl "$(__git_remotes)" "" "$cur_"
return
;;
branch.*.merge)
- __git_complete_refs
+ __git_complete_refs --cur="$cur_"
return
;;
branch.*.rebase)
- __gitcomp "false true merges preserve interactive"
+ __gitcomp "false true merges preserve interactive" "" "$cur_"
return
;;
remote.pushdefault)
- __gitcomp_nl "$(__git_remotes)"
+ __gitcomp_nl "$(__git_remotes)" "" "$cur_"
return
;;
remote.*.fetch)
- local remote="${prev#remote.}"
+ local remote="${varname#remote.}"
remote="${remote%.fetch}"
- if [ -z "$cur" ]; then
+ if [ -z "$cur_" ]; then
__gitcomp_nl "refs/heads/" "" "" ""
return
fi
- __gitcomp_nl "$(__git_refs_remotes "$remote")"
+ __gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
return
;;
remote.*.push)
- local remote="${prev#remote.}"
+ local remote="${varname#remote.}"
remote="${remote%.push}"
__gitcomp_nl "$(__git for-each-ref \
- --format='%(refname):%(refname)' refs/heads)"
+ --format='%(refname):%(refname)' refs/heads)" "" "$cur_"
return
;;
pull.twohead|pull.octopus)
__git_compute_merge_strategies
- __gitcomp "$__git_merge_strategies"
- return
- ;;
- color.branch|color.diff|color.interactive|\
- color.showbranch|color.status|color.ui)
- __gitcomp "always never auto"
+ __gitcomp "$__git_merge_strategies" "" "$cur_"
return
;;
color.pager)
- __gitcomp "false true"
+ __gitcomp "false true" "" "$cur_"
return
;;
color.*.*)
__gitcomp "
normal black red green yellow blue magenta cyan white
bold dim ul blink reverse
- "
+ " "" "$cur_"
+ return
+ ;;
+ color.*)
+ __gitcomp "false true always never auto" "" "$cur_"
return
;;
diff.submodule)
- __gitcomp "$__git_diff_submodule_formats"
+ __gitcomp "$__git_diff_submodule_formats" "" "$cur_"
return
;;
help.format)
- __gitcomp "man info web html"
+ __gitcomp "man info web html" "" "$cur_"
return
;;
log.date)
- __gitcomp "$__git_log_date_formats"
+ __gitcomp "$__git_log_date_formats" "" "$cur_"
return
;;
sendemail.aliasfiletype)
- __gitcomp "mutt mailrc pine elm gnus"
+ __gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
return
;;
sendemail.confirm)
- __gitcomp "$__git_send_email_confirm_options"
+ __gitcomp "$__git_send_email_confirm_options" "" "$cur_"
return
;;
sendemail.suppresscc)
- __gitcomp "$__git_send_email_suppresscc_options"
+ __gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
return
;;
sendemail.transferencoding)
- __gitcomp "7bit 8bit quoted-printable base64"
- return
- ;;
- --get|--get-all|--unset|--unset-all)
- __gitcomp_nl "$(__git_config_get_set_variables)"
+ __gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
return
;;
*.*)
return
;;
esac
- case "$cur" in
- --*)
- __gitcomp_builtin config
- return
- ;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+# completed. Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+# configuration variable name (but not to sections or
+# subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+ local cur_="$cur" sfx
+
+ while test $# != 0; do
+ case "$1" in
+ --cur=*) cur_="${1##--cur=}" ;;
+ --sfx=*) sfx="${1##--sfx=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
+
+ case "$cur_" in
branch.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
return
;;
branch.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur%.*}."
+ cur_="${cur#*.}"
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
- __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+ __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
return
;;
guitool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
__gitcomp "
argPrompt cmd confirm needsFile noConsole noRescan
prompt revPrompt revUnmerged title
- " "$pfx" "$cur_"
+ " "$pfx" "$cur_" "$sfx"
return
;;
difftool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
return
;;
man.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
return
;;
mergetool.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
return
;;
pager.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_#*.}"
__git_compute_all_commands
- __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+ __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
return
;;
remote.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
__gitcomp "
url proxy fetch push mirror skipDefaultUpdate
receivepack uploadpack tagOpt pushurl
- " "$pfx" "$cur_"
+ " "$pfx" "$cur_" "$sfx"
return
;;
remote.*)
- local pfx="${cur%.*}." cur_="${cur#*.}"
+ local pfx="${cur_%.*}."
+ cur_="${cur_#*.}"
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
- __gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+ __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
return
;;
url.*.*)
- local pfx="${cur%.*}." cur_="${cur##*.}"
- __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+ local pfx="${cur_%.*}."
+ cur_="${cur_##*.}"
+ __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
return
;;
*.*)
__git_compute_config_vars
- __gitcomp "$__git_config_vars"
+ __gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
;;
*)
__git_compute_config_vars
- __gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
+ __gitcomp "$(echo "$__git_config_vars" |
+ awk -F . '{
+ sections[$1] = 1
+ }
+ END {
+ for (s in sections)
+ print s "."
+ }
+ ')" "" "$cur_"
+ ;;
+ esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+# completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+ local cur_="$cur"
+
+ while test $# != 0; do
+ case "$1" in
+ --cur=*) cur_="${1##--cur=}" ;;
+ *) return 1 ;;
+ esac
+ shift
+ done
+
+ case "$cur_" in
+ *=*)
+ __git_complete_config_variable_value \
+ --varname="${cur_%%=*}" --cur="${cur_#*=}"
+ ;;
+ *)
+ __git_complete_config_variable_name --cur="$cur_" --sfx='='
+ ;;
+ esac
+}
+
+_git_config ()
+{
+ case "$prev" in
+ --get|--get-all|--unset|--unset-all)
+ __gitcomp_nl "$(__git_config_get_set_variables)"
+ return
+ ;;
+ *.*)
+ __git_complete_config_variable_value
+ return
+ ;;
+ esac
+ case "$cur" in
+ --*)
+ __gitcomp_builtin config
+ ;;
+ *)
+ __git_complete_config_variable_name
+ ;;
esac
}
__git_complete_refs
}
+_git_restore ()
+{
+ case "$cur" in
+ --conflict=*)
+ __gitcomp "diff3 merge" "" "${cur##--conflict=}"
+ ;;
+ --source=*)
+ __git_complete_refs --cur="${cur##--source=}"
+ ;;
+ --*)
+ __gitcomp_builtin restore
+ ;;
+ esac
+}
+
__git_revert_inprogress_options="--continue --quit --abort"
_git_revert ()
# Bash filename completion
return
;;
- -c|--namespace)
+ -c)
+ __git_complete_config_variable_name_and_value
+ return
+ ;;
+ --namespace)
# we don't support completing these options' arguments
return
;;
test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
}
+# see if a cherry-pick or revert is in progress, if the user has committed a
+# conflict resolution with 'git commit' in the middle of a sequence of picks or
+# reverts then CHERRY_PICK_HEAD/REVERT_HEAD will not exist so we have to read
+# the todo file.
+__git_sequencer_status ()
+{
+ local todo
+ if test -f "$g/CHERRY_PICK_HEAD"
+ then
+ r="|CHERRY-PICKING"
+ return 0;
+ elif test -f "$g/REVERT_HEAD"
+ then
+ r="|REVERTING"
+ return 0;
+ elif __git_eread "$g/sequencer/todo" todo
+ then
+ case "$todo" in
+ p[\ \ ]|pick[\ \ ]*)
+ r="|CHERRY-PICKING"
+ return 0
+ ;;
+ revert[\ \ ]*)
+ r="|REVERTING"
+ return 0
+ ;;
+ esac
+ fi
+ return 1
+}
+
# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
# when called from PS1 using command substitution
# in this mode it prints text to add to bash PS1 prompt (includes branch name)
fi
elif [ -f "$g/MERGE_HEAD" ]; then
r="|MERGING"
- elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
- r="|CHERRY-PICKING"
- elif [ -f "$g/REVERT_HEAD" ]; then
- r="|REVERTING"
+ elif __git_sequencer_status; then
+ :
elif [ -f "$g/BISECT_LOG" ]; then
r="|BISECTING"
fi
#include "pkt-line.h"
#include "sub-process.h"
#include "utf8.h"
+#include "ll-merge.h"
/*
* convert.c - convert a file when checking it out and checking it in.
const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
};
+static struct attr_check *check;
+
static void convert_attrs(const struct index_state *istate,
struct conv_attrs *ca, const char *path)
{
- static struct attr_check *check;
struct attr_check_item *ccheck = NULL;
if (!check) {
ca->crlf_action = CRLF_AUTO_INPUT;
}
+void reset_parsed_attributes(void)
+{
+ struct convert_driver *drv, *next;
+
+ attr_check_free(check);
+ check = NULL;
+ reset_merge_attributes();
+
+ for (drv = user_convert; drv; drv = next) {
+ next = drv->next;
+ free((void *)drv->name);
+ free(drv);
+ }
+ user_convert = NULL;
+ user_convert_tail = NULL;
+}
+
int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path)
{
struct conv_attrs ca;
int would_convert_to_git_filter_fd(const struct index_state *istate,
const char *path);
+/*
+ * Reset the internal list of attributes used by convert_to_git and
+ * convert_to_working_tree.
+ */
+void reset_parsed_attributes(void);
+
/*****************************************************************
*
* Streaming conversion support
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "%s://", c->protocol);
- strbuf_addstr_urlencode(&buf, c->username, 1);
+ strbuf_addstr_urlencode(&buf, c->username, is_rfc3986_unreserved);
strbuf_addch(&buf, ':');
- strbuf_addstr_urlencode(&buf, c->password, 1);
+ strbuf_addstr_urlencode(&buf, c->password, is_rfc3986_unreserved);
strbuf_addch(&buf, '@');
if (c->host)
- strbuf_addstr_urlencode(&buf, c->host, 1);
+ strbuf_addstr_urlencode(&buf, c->host, is_rfc3986_unreserved);
if (c->path) {
strbuf_addch(&buf, '/');
- strbuf_addstr_urlencode(&buf, c->path, 0);
+ strbuf_addstr_urlencode(&buf, c->path,
+ is_rfc3986_reserved_or_unreserved);
}
rewrite_credential_file(fn, c, &buf);
static unsigned int hash_obj(const struct object *obj, unsigned int n)
{
- return sha1hash(obj->oid.hash) % n;
+ return oidhash(&obj->oid) % n;
}
static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)
KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
-static khash_sha1 *island_marks;
+static kh_oid_map_t *island_marks;
static unsigned island_counter;
static unsigned island_counter_core;
* If we don't have a bitmap for the target, we can delta it
* against anything -- it's not an important object
*/
- trg_pos = kh_get_sha1(island_marks, trg_oid->hash);
+ trg_pos = kh_get_oid_map(island_marks, *trg_oid);
if (trg_pos >= kh_end(island_marks))
return 1;
* if the source (our delta base) doesn't have a bitmap,
* we don't want to base any deltas on it!
*/
- src_pos = kh_get_sha1(island_marks, src_oid->hash);
+ src_pos = kh_get_oid_map(island_marks, *src_oid);
if (src_pos >= kh_end(island_marks))
return 0;
if (!island_marks)
return 0;
- a_pos = kh_get_sha1(island_marks, a->hash);
+ a_pos = kh_get_oid_map(island_marks, *a);
if (a_pos < kh_end(island_marks))
a_bitmap = kh_value(island_marks, a_pos);
- b_pos = kh_get_sha1(island_marks, b->hash);
+ b_pos = kh_get_oid_map(island_marks, *b);
if (b_pos < kh_end(island_marks))
b_bitmap = kh_value(island_marks, b_pos);
khiter_t pos;
int hash_ret;
- pos = kh_put_sha1(island_marks, obj->oid.hash, &hash_ret);
+ pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
if (hash_ret)
kh_value(island_marks, pos) = island_bitmap_new(NULL);
khiter_t pos;
int hash_ret;
- pos = kh_put_sha1(island_marks, obj->oid.hash, &hash_ret);
+ pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
if (hash_ret) {
/*
* We don't have one yet; make a copy-on-write of the
struct name_entry entry;
khiter_t pos;
- pos = kh_get_sha1(island_marks, ent->idx.oid.hash);
+ pos = kh_get_oid_map(island_marks, ent->idx.oid);
if (pos >= kh_end(island_marks))
continue;
if (S_ISGITLINK(entry.mode))
continue;
- obj = lookup_object(r, entry.oid.hash);
+ obj = lookup_object(r, &entry.oid);
if (!obj)
continue;
void load_delta_islands(struct repository *r, int progress)
{
- island_marks = kh_init_sha1();
+ island_marks = kh_init_oid_map();
remote_islands = kh_init_str();
git_config(island_config_callback, NULL);
void propagate_island_marks(struct commit *commit)
{
- khiter_t pos = kh_get_sha1(island_marks, commit->object.oid.hash);
+ khiter_t pos = kh_get_oid_map(island_marks, commit->object.oid);
if (pos < kh_end(island_marks)) {
struct commit_list *p;
for (i = 0; i < to_pack->nr_objects; ++i) {
struct object_entry *entry = &to_pack->objects[i];
- khiter_t pos = kh_get_sha1(island_marks, entry->idx.oid.hash);
+ khiter_t pos = kh_get_oid_map(island_marks, entry->idx.oid);
oe_set_layer(to_pack, entry, 1);
#include "packfile.h"
#include "parse-options.h"
#include "help.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
if (ecbdata->opt->flags.dual_color_diffed_diffs)
strbuf_addstr(&msgbuf, reverse);
strbuf_addstr(&msgbuf, frag);
- strbuf_add(&msgbuf, line, ep - line);
+ if (ecbdata->opt->flags.suppress_hunk_header_line_count)
+ strbuf_add(&msgbuf, atat, sizeof(atat));
+ else
+ strbuf_add(&msgbuf, line, ep - line);
strbuf_addstr(&msgbuf, reset);
/*
return dst - line;
}
+void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
+{
+ unsigned char hash[GIT_MAX_RAWSZ];
+ unsigned short carry = 0;
+ int i;
+
+ git_SHA1_Final(hash, ctx);
+ git_SHA1_Init(ctx);
+ /* 20-byte sum, with carry */
+ for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
+ carry += result->hash[i] + hash[i];
+ result->hash[i] = carry;
+ carry >>= 8;
+ }
+}
+
static void patch_id_consume(void *priv, char *line, unsigned long len)
{
struct patch_id_t *data = priv;
git_SHA1_Update(ctx, buf, len);
}
-/* returns 0 upon success, and writes result into sha1 */
-static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
+/* returns 0 upon success, and writes result into oid */
+static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
git_SHA1_Init(&ctx);
memset(&data, 0, sizeof(struct patch_id_t));
data.ctx = &ctx;
+ oidclr(oid);
for (i = 0; i < q->nr; i++) {
xpparam_t xpp;
patch_id_consume, &data, &xpp, &xecfg))
return error("unable to generate patch-id diff for %s",
p->one->path);
+
+ if (stable)
+ flush_one_hunk(oid, &ctx);
}
- git_SHA1_Final(oid->hash, &ctx);
+ if (!stable)
+ git_SHA1_Final(oid->hash, &ctx);
+
return 0;
}
-int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only)
+int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable)
{
struct diff_queue_struct *q = &diff_queued_diff;
int i;
- int result = diff_get_patch_id(options, oid, diff_header_only);
+ int result = diff_get_patch_id(options, oid, diff_header_only, stable);
for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]);
const struct diff_filespec *filespec)
{
if (filespec && filespec->oid_valid &&
+ !S_ISGITLINK(filespec->mode) &&
oid_object_info_extended(r, &filespec->oid, NULL,
OBJECT_INFO_FOR_PREFETCH))
oid_array_append(to_fetch, &filespec->oid);
void diffcore_std(struct diff_options *options)
{
- if (options->repo == the_repository &&
- repository_format_partial_clone) {
+ if (options->repo == the_repository && has_promisor_remote()) {
/*
* Prefetch the diff pairs that are about to be flushed.
*/
/*
* NEEDSWORK: Consider deduplicating the OIDs sent.
*/
- fetch_objects(repository_format_partial_clone,
- to_fetch.oid, to_fetch.nr);
+ promisor_remote_get_direct(options->repo,
+ to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}
unsigned stat_with_summary;
unsigned suppress_diff_headers;
unsigned dual_color_diffed_diffs;
+ unsigned suppress_hunk_header_line_count;
};
static inline void diff_flags_or(struct diff_flags *a,
int run_diff_index(struct rev_info *revs, int cached);
int do_diff_cache(const struct object_id *, struct diff_options *);
-int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
+int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
+void flush_one_hunk(struct object_id *, git_SHA_CTX *);
int diff_result_code(struct diff_options *, int);
hash_object_file(filespec->data, filespec->size, "blob",
&filespec->oid);
}
- return sha1hash(filespec->oid.hash);
+ return oidhash(&filespec->oid);
}
static int find_identical_files(struct hashmap *srcs,
#include "dir-iterator.h"
struct dir_iterator_level {
- int initialized;
-
DIR *dir;
/*
* (including a trailing '/'):
*/
size_t prefix_len;
-
- /*
- * The last action that has been taken with the current entry
- * (needed for directories, which have to be included in the
- * iteration and also iterated into):
- */
- enum {
- DIR_STATE_ITER,
- DIR_STATE_RECURSE
- } dir_state;
};
/*
struct dir_iterator base;
/*
- * The number of levels currently on the stack. This is always
- * at least 1, because when it becomes zero the iteration is
- * ended and this struct is freed.
+ * The number of levels currently on the stack. After the first
+ * call to dir_iterator_begin(), if it succeeds to open the
+ * first level's dir, this will always be at least 1. Then,
+ * when it comes to zero the iteration is ended and this
+ * struct is freed.
*/
size_t levels_nr;
* that will be included in this iteration.
*/
struct dir_iterator_level *levels;
+
+ /* Combination of flags for this dir-iterator */
+ unsigned int flags;
};
+/*
+ * Push a level in the iter stack and initialize it with information from
+ * the directory pointed by iter->base->path. It is assumed that this
+ * strbuf points to a valid directory path. Return 0 on success and -1
+ * otherwise, setting errno accordingly and leaving the stack unchanged.
+ */
+static int push_level(struct dir_iterator_int *iter)
+{
+ struct dir_iterator_level *level;
+
+ ALLOC_GROW(iter->levels, iter->levels_nr + 1, iter->levels_alloc);
+ level = &iter->levels[iter->levels_nr++];
+
+ if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
+ strbuf_addch(&iter->base.path, '/');
+ level->prefix_len = iter->base.path.len;
+
+ level->dir = opendir(iter->base.path.buf);
+ if (!level->dir) {
+ int saved_errno = errno;
+ if (errno != ENOENT) {
+ warning_errno("error opening directory '%s'",
+ iter->base.path.buf);
+ }
+ iter->levels_nr--;
+ errno = saved_errno;
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Pop the top level on the iter stack, releasing any resources associated
+ * with it. Return the new value of iter->levels_nr.
+ */
+static int pop_level(struct dir_iterator_int *iter)
+{
+ struct dir_iterator_level *level =
+ &iter->levels[iter->levels_nr - 1];
+
+ if (level->dir && closedir(level->dir))
+ warning_errno("error closing directory '%s'",
+ iter->base.path.buf);
+ level->dir = NULL;
+
+ return --iter->levels_nr;
+}
+
+/*
+ * Populate iter->base with the necessary information on the next iteration
+ * entry, represented by the given dirent de. Return 0 on success and -1
+ * otherwise, setting errno accordingly.
+ */
+static int prepare_next_entry_data(struct dir_iterator_int *iter,
+ struct dirent *de)
+{
+ int err, saved_errno;
+
+ strbuf_addstr(&iter->base.path, de->d_name);
+ /*
+ * We have to reset these because the path strbuf might have
+ * been realloc()ed at the previous strbuf_addstr().
+ */
+ iter->base.relative_path = iter->base.path.buf +
+ iter->levels[0].prefix_len;
+ iter->base.basename = iter->base.path.buf +
+ iter->levels[iter->levels_nr - 1].prefix_len;
+
+ if (iter->flags & DIR_ITERATOR_FOLLOW_SYMLINKS)
+ err = stat(iter->base.path.buf, &iter->base.st);
+ else
+ err = lstat(iter->base.path.buf, &iter->base.st);
+
+ saved_errno = errno;
+ if (err && errno != ENOENT)
+ warning_errno("failed to stat '%s'", iter->base.path.buf);
+
+ errno = saved_errno;
+ return err;
+}
+
int dir_iterator_advance(struct dir_iterator *dir_iterator)
{
struct dir_iterator_int *iter =
(struct dir_iterator_int *)dir_iterator;
+ if (S_ISDIR(iter->base.st.st_mode) && push_level(iter)) {
+ if (errno != ENOENT && iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
+ if (iter->levels_nr == 0)
+ goto error_out;
+ }
+
+ /* Loop until we find an entry that we can give back to the caller. */
while (1) {
+ struct dirent *de;
struct dir_iterator_level *level =
&iter->levels[iter->levels_nr - 1];
- struct dirent *de;
- if (!level->initialized) {
- /*
- * Note: dir_iterator_begin() ensures that
- * path is not the empty string.
- */
- if (!is_dir_sep(iter->base.path.buf[iter->base.path.len - 1]))
- strbuf_addch(&iter->base.path, '/');
- level->prefix_len = iter->base.path.len;
-
- level->dir = opendir(iter->base.path.buf);
- if (!level->dir && errno != ENOENT) {
- warning("error opening directory %s: %s",
- iter->base.path.buf, strerror(errno));
- /* Popping the level is handled below */
- }
-
- level->initialized = 1;
- } else if (S_ISDIR(iter->base.st.st_mode)) {
- if (level->dir_state == DIR_STATE_ITER) {
- /*
- * The directory was just iterated
- * over; now prepare to iterate into
- * it.
- */
- level->dir_state = DIR_STATE_RECURSE;
- ALLOC_GROW(iter->levels, iter->levels_nr + 1,
- iter->levels_alloc);
- level = &iter->levels[iter->levels_nr++];
- level->initialized = 0;
- continue;
- } else {
- /*
- * The directory has already been
- * iterated over and iterated into;
- * we're done with it.
- */
+ strbuf_setlen(&iter->base.path, level->prefix_len);
+ errno = 0;
+ de = readdir(level->dir);
+
+ if (!de) {
+ if (errno) {
+ warning_errno("error reading directory '%s'",
+ iter->base.path.buf);
+ if (iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
+ } else if (pop_level(iter) == 0) {
+ return dir_iterator_abort(dir_iterator);
}
+ continue;
}
- if (!level->dir) {
- /*
- * This level is exhausted (or wasn't opened
- * successfully); pop up a level.
- */
- if (--iter->levels_nr == 0)
- return dir_iterator_abort(dir_iterator);
+ if (is_dot_or_dotdot(de->d_name))
+ continue;
+ if (prepare_next_entry_data(iter, de)) {
+ if (errno != ENOENT && iter->flags & DIR_ITERATOR_PEDANTIC)
+ goto error_out;
continue;
}
- /*
- * Loop until we find an entry that we can give back
- * to the caller:
- */
- while (1) {
- strbuf_setlen(&iter->base.path, level->prefix_len);
- errno = 0;
- de = readdir(level->dir);
-
- if (!de) {
- /* This level is exhausted; pop up a level. */
- if (errno) {
- warning("error reading directory %s: %s",
- iter->base.path.buf, strerror(errno));
- } else if (closedir(level->dir))
- warning("error closing directory %s: %s",
- iter->base.path.buf, strerror(errno));
-
- level->dir = NULL;
- if (--iter->levels_nr == 0)
- return dir_iterator_abort(dir_iterator);
- break;
- }
-
- if (is_dot_or_dotdot(de->d_name))
- continue;
-
- strbuf_addstr(&iter->base.path, de->d_name);
- if (lstat(iter->base.path.buf, &iter->base.st) < 0) {
- if (errno != ENOENT)
- warning("error reading path '%s': %s",
- iter->base.path.buf,
- strerror(errno));
- continue;
- }
-
- /*
- * We have to set these each time because
- * the path strbuf might have been realloc()ed.
- */
- iter->base.relative_path =
- iter->base.path.buf + iter->levels[0].prefix_len;
- iter->base.basename =
- iter->base.path.buf + level->prefix_len;
- level->dir_state = DIR_STATE_ITER;
-
- return ITER_OK;
- }
+ return ITER_OK;
}
+
+error_out:
+ dir_iterator_abort(dir_iterator);
+ return ITER_ERROR;
}
int dir_iterator_abort(struct dir_iterator *dir_iterator)
&iter->levels[iter->levels_nr - 1];
if (level->dir && closedir(level->dir)) {
+ int saved_errno = errno;
strbuf_setlen(&iter->base.path, level->prefix_len);
- warning("error closing directory %s: %s",
- iter->base.path.buf, strerror(errno));
+ errno = saved_errno;
+ warning_errno("error closing directory '%s'",
+ iter->base.path.buf);
}
}
return ITER_DONE;
}
-struct dir_iterator *dir_iterator_begin(const char *path)
+struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags)
{
struct dir_iterator_int *iter = xcalloc(1, sizeof(*iter));
struct dir_iterator *dir_iterator = &iter->base;
-
- if (!path || !*path)
- BUG("empty path passed to dir_iterator_begin()");
+ int saved_errno;
strbuf_init(&iter->base.path, PATH_MAX);
strbuf_addstr(&iter->base.path, path);
ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
+ iter->levels_nr = 0;
+ iter->flags = flags;
- iter->levels_nr = 1;
- iter->levels[0].initialized = 0;
+ /*
+ * Note: stat already checks for NULL or empty strings and
+ * inexistent paths.
+ */
+ if (stat(iter->base.path.buf, &iter->base.st) < 0) {
+ saved_errno = errno;
+ goto error_out;
+ }
+
+ if (!S_ISDIR(iter->base.st.st_mode)) {
+ saved_errno = ENOTDIR;
+ goto error_out;
+ }
return dir_iterator;
+
+error_out:
+ dir_iterator_abort(dir_iterator);
+ errno = saved_errno;
+ return NULL;
}
*
* Iterate over a directory tree, recursively, including paths of all
* types and hidden paths. Skip "." and ".." entries and don't follow
- * symlinks except for the original path.
+ * symlinks except for the original path. Note that the original path
+ * is not included in the iteration.
*
* Every time dir_iterator_advance() is called, update the members of
* the dir_iterator structure to reflect the next path in the
* iteration. The order that paths are iterated over within a
- * directory is undefined, but directory paths are always iterated
- * over before the subdirectory contents.
+ * directory is undefined, directory paths are always given before
+ * their contents.
*
* A typical iteration looks like this:
*
* int ok;
- * struct iterator *iter = dir_iterator_begin(path);
+ * unsigned int flags = DIR_ITERATOR_PEDANTIC;
+ * struct dir_iterator *iter = dir_iterator_begin(path, flags);
+ *
+ * if (!iter)
+ * goto error_handler;
*
* while ((ok = dir_iterator_advance(iter)) == ITER_OK) {
* if (want_to_stop_iteration()) {
* dir_iterator_advance() again.
*/
+/*
+ * Flags for dir_iterator_begin:
+ *
+ * - DIR_ITERATOR_PEDANTIC: override dir-iterator's default behavior
+ * in case of an error at dir_iterator_advance(), which is to keep
+ * looking for a next valid entry. With this flag, resources are freed
+ * and ITER_ERROR is returned immediately. In both cases, a meaningful
+ * warning is emitted. Note: ENOENT errors are always ignored so that
+ * the API users may remove files during iteration.
+ *
+ * - DIR_ITERATOR_FOLLOW_SYMLINKS: make dir-iterator follow symlinks.
+ * i.e., linked directories' contents will be iterated over and
+ * iter->base.st will contain information on the referred files,
+ * not the symlinks themselves, which is the default behavior. Broken
+ * symlinks are ignored.
+ *
+ * Warning: circular symlinks are also followed when
+ * DIR_ITERATOR_FOLLOW_SYMLINKS is set. The iteration may end up with
+ * an ELOOP if they happen and DIR_ITERATOR_PEDANTIC is set.
+ */
+#define DIR_ITERATOR_PEDANTIC (1 << 0)
+#define DIR_ITERATOR_FOLLOW_SYMLINKS (1 << 1)
+
struct dir_iterator {
/* The current path: */
struct strbuf path;
/* The current basename: */
const char *basename;
- /* The result of calling lstat() on path: */
+ /*
+ * The result of calling lstat() on path; or stat(), if the
+ * DIR_ITERATOR_FOLLOW_SYMLINKS flag was set at
+ * dir_iterator's initialization.
+ */
struct stat st;
};
/*
- * Start a directory iteration over path. Return a dir_iterator that
- * holds the internal state of the iteration.
+ * Start a directory iteration over path with the combination of
+ * options specified by flags. On success, return a dir_iterator
+ * that holds the internal state of the iteration. In case of
+ * failure, return NULL and set errno accordingly.
*
* The iteration includes all paths under path, not including path
* itself and not including "." or ".." entries.
*
- * path is the starting directory. An internal copy will be made.
+ * Parameters are:
+ * - path is the starting directory. An internal copy will be made.
+ * - flags is a combination of the possible flags to initialize a
+ * dir-iterator or 0 for default behavior.
*/
-struct dir_iterator *dir_iterator_begin(const char *path);
+struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags);
/*
* Advance the iterator to the first or next item and return ITER_OK.
* If the iteration is exhausted, free the dir_iterator and any
- * resources associated with it and return ITER_DONE. On error, free
- * dir_iterator and associated resources and return ITER_ERROR. It is
- * a bug to use iterator or call this function again after it has
- * returned ITER_DONE or ITER_ERROR.
+ * resources associated with it and return ITER_DONE.
+ *
+ * It is a bug to use iterator or call this function again after it
+ * has returned ITER_DONE or ITER_ERROR (which may be returned iff
+ * the DIR_ITERATOR_PEDANTIC flag was set).
*/
int dir_iterator_advance(struct dir_iterator *iterator);
int warn_on_object_refname_ambiguity = 1;
int ref_paranoia = -1;
int repository_format_precious_objects;
-char *repository_format_partial_clone;
-const char *core_partial_clone_filter_default;
int repository_format_worktree_config;
const char *git_commit_encoding;
const char *git_log_output_encoding;
oidcpy(&commit_oid, &commit_oe->idx.oid);
} else if (!get_oid(p, &commit_oid)) {
unsigned long size;
- char *buf = read_object_with_reference(&commit_oid,
+ char *buf = read_object_with_reference(the_repository,
+ &commit_oid,
commit_type, &size,
&commit_oid);
if (!buf || size < the_hash_algo->hexsz + 6)
unsigned long size;
char *buf;
- buf = read_object_with_reference(&b->oid, commit_type, &size,
+ buf = read_object_with_reference(the_repository,
+ &b->oid, commit_type, &size,
&b->oid);
parse_from_commit(b, buf, size);
free(buf);
oidcpy(&n->oid, &oe->idx.oid);
} else if (!get_oid(from, &n->oid)) {
unsigned long size;
- char *buf = read_object_with_reference(&n->oid,
+ char *buf = read_object_with_reference(the_repository,
+ &n->oid,
commit_type,
&size, &n->oid);
if (!buf || size < the_hash_algo->hexsz + 6)
struct branch *b;
char *author = NULL;
char *committer = NULL;
+ const char *encoding = NULL;
struct hash_list *merge_list = NULL;
unsigned int merge_count;
unsigned char prev_fanout, new_fanout;
}
if (!committer)
die("Expected committer but didn't get one");
+ if (skip_prefix(command_buf.buf, "encoding ", &encoding))
+ read_next_command();
parse_data(&msg, 0, NULL);
read_next_command();
parse_from(b);
}
strbuf_addf(&new_data,
"author %s\n"
- "committer %s\n"
- "\n",
+ "committer %s\n",
author ? author : committer, committer);
+ if (encoding)
+ strbuf_addf(&new_data,
+ "encoding %s\n",
+ encoding);
+ strbuf_addch(&new_data, '\n');
strbuf_addbuf(&new_data, &msg);
free(author);
free(committer);
#include "fetch-negotiator.h"
#include "negotiator/default.h"
#include "negotiator/skipping.h"
+#include "repository.h"
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
- const char *algorithm)
+void fetch_negotiator_init(struct repository *r,
+ struct fetch_negotiator *negotiator)
{
- if (algorithm) {
- if (!strcmp(algorithm, "skipping")) {
- skipping_negotiator_init(negotiator);
- return;
- } else if (!strcmp(algorithm, "default")) {
- /* Fall through to default initialization */
- } else {
- die("unknown fetch negotiation algorithm '%s'", algorithm);
- }
+ prepare_repo_settings(r);
+ switch(r->settings.fetch_negotiation_algorithm) {
+ case FETCH_NEGOTIATION_SKIPPING:
+ skipping_negotiator_init(negotiator);
+ return;
+
+ case FETCH_NEGOTIATION_DEFAULT:
+ default:
+ default_negotiator_init(negotiator);
+ return;
}
- default_negotiator_init(negotiator);
}
#define FETCH_NEGOTIATOR_H
struct commit;
+struct repository;
/*
* An object that supplies the information needed to negotiate the contents of
void *data;
};
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
- const char *algorithm);
+void fetch_negotiator_init(struct repository *r,
+ struct fetch_negotiator *negotiator);
#endif
+++ /dev/null
-#include "cache.h"
-#include "packfile.h"
-#include "pkt-line.h"
-#include "strbuf.h"
-#include "transport.h"
-#include "fetch-object.h"
-
-static void fetch_refs(const char *remote_name, struct ref *ref)
-{
- struct remote *remote;
- struct transport *transport;
- int original_fetch_if_missing = fetch_if_missing;
-
- fetch_if_missing = 0;
- remote = remote_get(remote_name);
- if (!remote->url[0])
- die(_("Remote with no URL"));
- transport = transport_get(remote, remote->url[0]);
-
- transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
- transport_fetch_refs(transport, ref);
- fetch_if_missing = original_fetch_if_missing;
-}
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
- int oid_nr)
-{
- struct ref *ref = NULL;
- int i;
-
- for (i = 0; i < oid_nr; i++) {
- struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
- oidcpy(&new_ref->old_oid, &oids[i]);
- new_ref->exact_oid = 1;
- new_ref->next = ref;
- ref = new_ref;
- }
- fetch_refs(remote_name, ref);
-}
+++ /dev/null
-#ifndef FETCH_OBJECT_H
-#define FETCH_OBJECT_H
-
-struct object_id;
-
-void fetch_objects(const char *remote_name, const struct object_id *oids,
- int oid_nr);
-
-#endif
static int server_supports_filtering;
static struct lock_file shallow_lock;
static const char *alternate_shallow_file;
-static char *negotiation_algorithm;
static struct strbuf fsck_msg_types = STRBUF_INIT;
/* Remember to update object flag allocation in object.h */
* we cannot trust the object flags).
*/
if (!args->no_dependents &&
- ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
+ ((o = lookup_object(the_repository, remote)) != NULL) &&
(o->flags & COMPLETE)) {
continue;
}
}
}
if (server_supports_filtering && args->filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&args->filter_options,
- &expanded_filter_spec);
- packet_buf_write(&req_buf, "filter %s",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ const char *spec =
+ expand_list_objects_filter_spec(&args->filter_options);
+ packet_buf_write(&req_buf, "filter %s", spec);
}
packet_buf_flush(&req_buf);
state_len = req_buf.len;
if (skip_prefix(reader.line, "unshallow ", &arg)) {
if (get_oid_hex(arg, &oid))
die(_("invalid unshallow line: %s"), reader.line);
- if (!lookup_object(the_repository, oid.hash))
+ if (!lookup_object(the_repository, &oid))
die(_("object not found: %s"), reader.line);
/* make sure that it is parsed as shallow */
if (!parse_object(the_repository, &oid))
for (ref = *refs; ref; ref = ref->next) {
struct object *o = deref_tag(the_repository,
lookup_object(the_repository,
- ref->old_oid.hash),
+ &ref->old_oid),
NULL, 0);
if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
const struct object_id *remote = &ref->old_oid;
struct object *o;
- o = lookup_object(the_repository, remote->hash);
+ o = lookup_object(the_repository, remote);
if (!o || !(o->flags & COMPLETE)) {
retval = 0;
print_verbose(args, "want %s (%s)", oid_to_hex(remote),
struct shallow_info *si,
char **pack_lockfile)
{
+ struct repository *r = the_repository;
struct ref *ref = copy_ref_list(orig_ref);
struct object_id oid;
const char *agent_feature;
int agent_len;
struct fetch_negotiator negotiator;
- fetch_negotiator_init(&negotiator, negotiation_algorithm);
+ fetch_negotiator_init(r, &negotiator);
sort_ref_list(&ref, ref_compare_name);
QSORT(sought, nr_sought, cmp_ref_by_name);
- if ((args->depth > 0 || is_repository_shallow(the_repository)) && !server_supports("shallow"))
+ if ((agent_feature = server_feature_value("agent", &agent_len))) {
+ agent_supported = 1;
+ if (agent_len)
+ print_verbose(args, _("Server version is %.*s"),
+ agent_len, agent_feature);
+ }
+
+ if (server_supports("shallow"))
+ print_verbose(args, _("Server supports %s"), "shallow");
+ else if (args->depth > 0 || is_repository_shallow(r))
die(_("Server does not support shallow clients"));
if (args->depth > 0 || args->deepen_since || args->deepen_not)
args->deepen = 1;
if (server_supports("multi_ack_detailed")) {
- print_verbose(args, _("Server supports multi_ack_detailed"));
+ print_verbose(args, _("Server supports %s"), "multi_ack_detailed");
multi_ack = 2;
if (server_supports("no-done")) {
- print_verbose(args, _("Server supports no-done"));
+ print_verbose(args, _("Server supports %s"), "no-done");
if (args->stateless_rpc)
no_done = 1;
}
}
else if (server_supports("multi_ack")) {
- print_verbose(args, _("Server supports multi_ack"));
+ print_verbose(args, _("Server supports %s"), "multi_ack");
multi_ack = 1;
}
if (server_supports("side-band-64k")) {
- print_verbose(args, _("Server supports side-band-64k"));
+ print_verbose(args, _("Server supports %s"), "side-band-64k");
use_sideband = 2;
}
else if (server_supports("side-band")) {
- print_verbose(args, _("Server supports side-band"));
+ print_verbose(args, _("Server supports %s"), "side-band");
use_sideband = 1;
}
if (server_supports("allow-tip-sha1-in-want")) {
- print_verbose(args, _("Server supports allow-tip-sha1-in-want"));
+ print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want");
allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
}
if (server_supports("allow-reachable-sha1-in-want")) {
- print_verbose(args, _("Server supports allow-reachable-sha1-in-want"));
+ print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want");
allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
}
- if (!server_supports("thin-pack"))
+ if (server_supports("thin-pack"))
+ print_verbose(args, _("Server supports %s"), "thin-pack");
+ else
args->use_thin_pack = 0;
- if (!server_supports("no-progress"))
+ if (server_supports("no-progress"))
+ print_verbose(args, _("Server supports %s"), "no-progress");
+ else
args->no_progress = 0;
- if (!server_supports("include-tag"))
+ if (server_supports("include-tag"))
+ print_verbose(args, _("Server supports %s"), "include-tag");
+ else
args->include_tag = 0;
if (server_supports("ofs-delta"))
- print_verbose(args, _("Server supports ofs-delta"));
+ print_verbose(args, _("Server supports %s"), "ofs-delta");
else
prefer_ofs_delta = 0;
if (server_supports("filter")) {
server_supports_filtering = 1;
- print_verbose(args, _("Server supports filter"));
+ print_verbose(args, _("Server supports %s"), "filter");
} else if (args->filter_options.choice) {
warning("filtering not recognized by server, ignoring");
}
- if ((agent_feature = server_feature_value("agent", &agent_len))) {
- agent_supported = 1;
- if (agent_len)
- print_verbose(args, _("Server version is %.*s"),
- agent_len, agent_feature);
- }
- if (server_supports("deepen-since"))
+ if (server_supports("deepen-since")) {
+ print_verbose(args, _("Server supports %s"), "deepen-since");
deepen_since_ok = 1;
- else if (args->deepen_since)
+ } else if (args->deepen_since)
die(_("Server does not support --shallow-since"));
- if (server_supports("deepen-not"))
+ if (server_supports("deepen-not")) {
+ print_verbose(args, _("Server supports %s"), "deepen-not");
deepen_not_ok = 1;
- else if (args->deepen_not)
+ } else if (args->deepen_not)
die(_("Server does not support --shallow-exclude"));
- if (!server_supports("deepen-relative") && args->deepen_relative)
+ if (server_supports("deepen-relative"))
+ print_verbose(args, _("Server supports %s"), "deepen-relative");
+ else if (args->deepen_relative)
die(_("Server does not support --deepen"));
if (!args->no_dependents) {
* we cannot trust the object flags).
*/
if (!no_dependents &&
- ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
+ ((o = lookup_object(the_repository, remote)) != NULL) &&
(o->flags & COMPLETE)) {
continue;
}
}
static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
- const struct fetch_pack_args *args,
+ struct fetch_pack_args *args,
const struct ref *wants, struct oidset *common,
int *haves_to_send, int *in_vain,
int sideband_all)
/* Add filter */
if (server_supports_feature("fetch", "filter", 0) &&
args->filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
+ const char *spec =
+ expand_list_objects_filter_spec(&args->filter_options);
print_verbose(args, _("Server supports filter"));
- expand_list_objects_filter_spec(&args->filter_options,
- &expanded_filter_spec);
- packet_buf_write(&req_buf, "filter %s",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ packet_buf_write(&req_buf, "filter %s", spec);
} else if (args->filter_options.choice) {
warning("filtering not recognized by server, ignoring");
}
if (skip_prefix(reader->line, "unshallow ", &arg)) {
if (get_oid_hex(arg, &oid))
die(_("invalid unshallow line: %s"), reader->line);
- if (!lookup_object(the_repository, oid.hash))
+ if (!lookup_object(the_repository, &oid))
die(_("object not found: %s"), reader->line);
/* make sure that it is parsed as shallow */
if (!parse_object(the_repository, &oid))
struct shallow_info *si,
char **pack_lockfile)
{
+ struct repository *r = the_repository;
struct ref *ref = copy_ref_list(orig_ref);
enum fetch_state state = FETCH_CHECK_LOCAL;
struct oidset common = OIDSET_INIT;
int in_vain = 0;
int haves_to_send = INITIAL_FLUSH;
struct fetch_negotiator negotiator;
- fetch_negotiator_init(&negotiator, negotiation_algorithm);
+ fetch_negotiator_init(r, &negotiator);
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_DIE_ON_ERR_PACKET);
git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
- git_config_get_string("fetch.negotiationalgorithm",
- &negotiation_algorithm);
git_config(fetch_pack_config_cb, NULL);
}
return msg_type;
}
-static void init_skiplist(struct fsck_options *options, const char *path)
-{
- FILE *fp;
- struct strbuf sb = STRBUF_INIT;
- struct object_id oid;
-
- fp = fopen(path, "r");
- if (!fp)
- die("Could not open skip list: %s", path);
- while (!strbuf_getline(&sb, fp)) {
- const char *p;
- const char *hash;
-
- /*
- * Allow trailing comments, leading whitespace
- * (including before commits), and empty or whitespace
- * only lines.
- */
- hash = strchr(sb.buf, '#');
- if (hash)
- strbuf_setlen(&sb, hash - sb.buf);
- strbuf_trim(&sb);
- if (!sb.len)
- continue;
-
- if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
- die("Invalid SHA-1: %s", sb.buf);
- oidset_insert(&options->skiplist, &oid);
- }
- if (ferror(fp))
- die_errno("Could not read '%s'", path);
- fclose(fp);
- strbuf_release(&sb);
-}
-
static int parse_msg_type(const char *str)
{
if (!strcmp(str, "error"))
if (!strcmp(buf, "skiplist")) {
if (equal == len)
die("skiplist requires a path");
- init_skiplist(options, buf + equal + 1);
+ oidset_parse_file(&options->skiplist, buf + equal + 1);
buf += len + 1;
continue;
}
blob = lookup_blob(the_repository, oid);
if (!blob) {
- struct object *obj = lookup_unknown_object(oid->hash);
+ struct object *obj = lookup_unknown_object(oid);
ret |= report(options, obj,
FSCK_MSG_GITMODULES_BLOB,
"non-blob found at .gitmodules");
#ifndef NO_GETTEXT
# include <locale.h>
# include <libintl.h>
-# ifdef HAVE_LIBCHARSET_H
+# ifdef GIT_WINDOWS_NATIVE
+
+static const char *locale_charset(void)
+{
+ const char *env = getenv("LC_ALL"), *dot;
+
+ if (!env || !*env)
+ env = getenv("LC_CTYPE");
+ if (!env || !*env)
+ env = getenv("LANG");
+
+ if (!env)
+ return "UTF-8";
+
+ dot = strchr(env, '.');
+ return !dot ? env : dot + 1;
+}
+
+# elif defined HAVE_LIBCHARSET_H
# include <libcharset.h>
# else
# include <langinfo.h>
int use_gettext_poison(void)
{
static int poison_requested = -1;
- if (poison_requested == -1) {
- const char *v = getenv("GIT_TEST_GETTEXT_POISON");
- poison_requested = v && strlen(v) ? 1 : 0;
- }
+ if (poison_requested == -1)
+ poison_requested = git_env_bool("GIT_TEST_GETTEXT_POISON", 0);
return poison_requested;
}
FILTER => undef,
IS_REVERSE => 0,
},
+ 'worktree_head' => {
+ DIFF => 'diff-index -p',
+ APPLY => sub { apply_patch 'apply -R', @_ },
+ APPLY_CHECK => 'apply -R',
+ FILTER => undef,
+ IS_REVERSE => 1,
+ },
+ 'worktree_nothead' => {
+ DIFF => 'diff-index -R -p',
+ APPLY => sub { apply_patch 'apply', @_ },
+ APPLY_CHECK => 'apply',
+ FILTER => undef,
+ IS_REVERSE => 0,
+ },
);
$patch_mode = 'stage';
marked for discarding."),
checkout_nothead => N__(
"If the patch applies cleanly, the edited hunk will immediately be
+marked for applying."),
+ worktree_head => N__(
+"If the patch applies cleanly, the edited hunk will immediately be
+marked for discarding."),
+ worktree_nothead => N__(
+"If the patch applies cleanly, the edited hunk will immediately be
marked for applying."),
);
n - do not apply this hunk to index and worktree
q - quit; do not apply this hunk or any of the remaining ones
a - apply this hunk and all later hunks in the file
+d - do not apply this hunk or any of the later hunks in the file"),
+ worktree_head => N__(
+"y - discard this hunk from worktree
+n - do not discard this hunk from worktree
+q - quit; do not discard this hunk or any of the remaining ones
+a - discard this hunk and all later hunks in the file
+d - do not discard this hunk or any of the later hunks in the file"),
+ worktree_nothead => N__(
+"y - apply this hunk to worktree
+n - do not apply this hunk to worktree
+q - quit; do not apply this hunk or any of the remaining ones
+a - apply this hunk and all later hunks in the file
d - do not apply this hunk or any of the later hunks in the file"),
);
deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
},
+ worktree_head => {
+ mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
+ deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+ hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+ },
+ worktree_nothead => {
+ mode => N__("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
+ deletion => N__("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
+ hunk => N__("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
+ },
);
sub patch_update_file {
'checkout_head' : 'checkout_nothead');
$arg = shift @ARGV or die __("missing --");
}
+ } elsif ($1 eq 'worktree') {
+ $arg = shift @ARGV or die __("missing --");
+ if ($arg eq '--') {
+ $patch_mode = 'checkout_index';
+ } else {
+ $patch_mode_revision = $arg;
+ $patch_mode = ($arg eq 'HEAD' ?
+ 'worktree_head' : 'worktree_nothead');
+ $arg = shift @ARGV or die __("missing --");
+ }
} elsif ($1 eq 'stage' or $1 eq 'stash') {
$patch_mode = $1;
$arg = shift @ARGV or die __("missing --");
#ifndef GIT_COMPAT_UTIL_H
#define GIT_COMPAT_UTIL_H
+#ifdef USE_MSVC_CRTDBG
+/*
+ * For these to work they must appear very early in each
+ * file -- before most of the standard header files.
+ */
+#include <stdlib.h>
+#include <crtdbg.h>
+#endif
+
#define _FILE_OFFSET_BITS 64
int git_atexit(void (*handler)(void));
#endif
-typedef void (*try_to_free_t)(size_t);
-try_to_free_t set_try_to_free_routine(try_to_free_t);
-
static inline size_t st_add(size_t a, size_t b)
{
if (unsigned_add_overflows(a, b))
set PARENT {}
set MERGE_HEAD [list]
set commit_type {}
+set commit_type_is_amend 0
set empty_tree {}
set current_branch {}
set is_detached 0
set is_3way_diff 0
set is_submodule_diff 0
set is_conflict_diff 0
-set selected_commit_type new
set diff_empty_count 0
+set last_revert {}
+set last_revert_enc {}
set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001"
}
proc force_amend {} {
- global selected_commit_type
+ global commit_type_is_amend
global HEAD PARENT MERGE_HEAD commit_type
repository_state newType newHEAD newMERGE_HEAD
set MERGE_HEAD $newMERGE_HEAD
set commit_type $newType
- set selected_commit_type amend
+ set commit_type_is_amend 1
do_select_commit_type
}
proc toggle_or_diff {mode w args} {
global file_states file_lists current_diff_path ui_index ui_workdir
- global last_clicked selected_paths
+ global last_clicked selected_paths file_lists_last_clicked
if {$mode eq "click"} {
foreach {x y} $args break
$ui_index tag remove in_sel 0.0 end
$ui_workdir tag remove in_sel 0.0 end
+ set file_lists_last_clicked($w) $path
+
# Determine the state of the file
if {[info exists file_states($path)]} {
set state [lindex $file_states($path) 0]
}
}
+proc focus_widget {widget} {
+ global file_lists last_clicked selected_paths
+ global file_lists_last_clicked
+
+ if {[llength $file_lists($widget)] > 0} {
+ set path $file_lists_last_clicked($widget)
+ set index [lsearch -sorted -exact $file_lists($widget) $path]
+ if {$index < 0} {
+ set index 0
+ set path [lindex $file_lists($widget) $index]
+ }
+
+ focus $widget
+ set last_clicked [list $widget [expr $index + 1]]
+ array unset selected_paths
+ set selected_paths($path) 1
+ show_diff $path $widget
+ }
+}
+
+proc toggle_commit_type {} {
+ global commit_type_is_amend
+ set commit_type_is_amend [expr !$commit_type_is_amend]
+ do_select_commit_type
+}
+
######################################################################
##
## ui construction
menu .mbar.commit
if {![is_enabled nocommit]} {
- .mbar.commit add radiobutton \
- -label [mc "New Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value new
- lappend disable_on_lock \
- [list .mbar.commit entryconf [.mbar.commit index last] -state]
-
- .mbar.commit add radiobutton \
+ .mbar.commit add checkbutton \
-label [mc "Amend Last Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value amend
+ -accelerator $M1T-E \
+ -variable commit_type_is_amend \
+ -command do_select_commit_type
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
wm protocol . WM_DELETE_WINDOW do_quit
bind all <$M1B-Key-q> do_quit
bind all <$M1B-Key-Q> do_quit
-bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
+
+set m1b_w_script {
+ set toplvl_win [winfo toplevel %W]
+
+ # If we are destroying the main window, we should call do_quit to take
+ # care of cleanup before exiting the program.
+ if {$toplvl_win eq "."} {
+ do_quit
+ } else {
+ destroy $toplvl_win
+ }
+}
+
+bind all <$M1B-Key-w> $m1b_w_script
+bind all <$M1B-Key-W> $m1b_w_script
+
+unset m1b_w_script
set subcommand_args {}
proc usage {} {
set ui_coml .vpane.lower.commarea.buffer.header.l
if {![is_enabled nocommit]} {
- ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
- -text [mc "New Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value new
- lappend disable_on_lock \
- [list .vpane.lower.commarea.buffer.header.new conf -state]
- ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
+ ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
-text [mc "Amend Last Commit"] \
- -command do_select_commit_type \
- -variable selected_commit_type \
- -value amend
+ -variable commit_type_is_amend \
+ -command do_select_commit_type
lappend disable_on_lock \
[list .vpane.lower.commarea.buffer.header.amend conf -state]
}
if {![is_enabled nocommit]} {
pack .vpane.lower.commarea.buffer.header.amend -side right
- pack .vpane.lower.commarea.buffer.header.new -side right
}
textframe .vpane.lower.commarea.buffer.frame
-relief sunken \
-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
-font font_diff \
+ -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
+${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
+ -orient horizontal \
+ -command [list $ui_comm xview]
${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
+ -orient vertical \
-command [list $ui_comm yview]
+pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
pack $ui_comm -side left -fill y
pack .vpane.lower.commarea.buffer.header -side top -fill x
menu $ctxm -tearoff 0
$ctxm add command \
-label [mc "Apply/Reverse Hunk"] \
- -command {apply_hunk $cursorX $cursorY}
+ -command {apply_or_revert_hunk $cursorX $cursorY 0}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
$ctxm add command \
-label [mc "Apply/Reverse Line"] \
- -command {apply_range_or_line $cursorX $cursorY; do_rescan}
+ -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan}
set ui_diff_applyline [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
$ctxm add separator
+$ctxm add command \
+ -label [mc "Revert Hunk"] \
+ -command {apply_or_revert_hunk $cursorX $cursorY 1}
+set ui_diff_reverthunk [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state]
+$ctxm add command \
+ -label [mc "Revert Line"] \
+ -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan}
+set ui_diff_revertline [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
+$ctxm add command \
+ -label [mc "Undo Last Revert"] \
+ -command {undo_last_revert; do_rescan}
+set ui_diff_undorevert [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state]
+$ctxm add separator
$ctxm add command \
-label [mc "Show Less Context"] \
-command show_less_context
}
proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
- global current_diff_path file_states
+ global current_diff_path file_states last_revert
set ::cursorX $x
set ::cursorY $y
if {[info exists file_states($current_diff_path)]} {
tk_popup $ctxmsm $X $Y
} else {
set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
+ set u [mc "Undo Last Revert"]
if {$::ui_index eq $::current_diff_side} {
set l [mc "Unstage Hunk From Commit"]
+ set h [mc "Revert Hunk"]
+
if {$has_range} {
set t [mc "Unstage Lines From Commit"]
+ set r [mc "Revert Lines"]
} else {
set t [mc "Unstage Line From Commit"]
+ set r [mc "Revert Line"]
}
} else {
set l [mc "Stage Hunk For Commit"]
+ set h [mc "Revert Hunk"]
+
if {$has_range} {
set t [mc "Stage Lines For Commit"]
+ set r [mc "Revert Lines"]
} else {
set t [mc "Stage Line For Commit"]
+ set r [mc "Revert Line"]
}
}
if {$::is_3way_diff
|| [string match {T?} $state]
|| [has_textconv $current_diff_path]} {
set s disabled
+ set revert_state disabled
} else {
set s normal
+
+ # Only allow reverting changes in the working tree. If
+ # the user wants to revert changes in the index, they
+ # need to unstage those first.
+ if {$::ui_workdir eq $::current_diff_side} {
+ set revert_state normal
+ } else {
+ set revert_state disabled
+ }
+ }
+
+ if {$last_revert eq {}} {
+ set undo_state disabled
+ } else {
+ set undo_state normal
}
+
$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
$ctxm entryconf $::ui_diff_applyline -state $s -label $t
+ $ctxm entryconf $::ui_diff_revertline -state $revert_state \
+ -label $r
+ $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \
+ -label $h
+ $ctxm entryconf $::ui_diff_undorevert -state $undo_state \
+ -label $u
+
tk_popup $ctxm $X $Y
}
}
bind . <$M1B-Key-J> do_revert_selection
bind . <$M1B-Key-i> do_add_all
bind . <$M1B-Key-I> do_add_all
+bind . <$M1B-Key-e> toggle_commit_type
+bind . <$M1B-Key-E> toggle_commit_type
bind . <$M1B-Key-minus> {show_less_context;break}
bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
bind . <$M1B-Key-equal> {show_more_context;break}
}
unset i
+bind . <Alt-Key-1> {focus_widget $::ui_workdir}
+bind . <Alt-Key-2> {focus_widget $::ui_index}
+bind . <Alt-Key-3> {focus $::ui_diff}
+bind . <Alt-Key-4> {focus $::ui_comm}
+
+set file_lists_last_clicked($ui_index) {}
+set file_lists_last_clicked($ui_workdir) {}
+
set file_lists($ui_index) [list]
set file_lists($ui_workdir) [list]
}
method _after_readtree {} {
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type HEAD MERGE_HEAD PARENT
global current_branch is_detached
global ui_comm
# amend mode our file lists are accurate and we can avoid
# the rescan.
#
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT
global ui_comm
unlock_index
set name [_name $this]
- set selected_commit_type new
+ set commit_type_is_amend 0
if {[string match amend* $commit_type]} {
$ui_comm delete 0.0 end
$ui_comm edit reset
proc commit_committree {fd_wt curHEAD msg_p} {
global HEAD PARENT MERGE_HEAD commit_type commit_author
global current_branch
- global ui_comm selected_commit_type
+ global ui_comm commit_type_is_amend
global file_states selected_paths rescan_active
global repo_config
global env
# -- Update in memory status
#
- set selected_commit_type new
set commit_type normal
+ set commit_type_is_amend 0
set HEAD $cmt_id
set PARENT $cmt_id
set MERGE_HEAD [list]
proc force_diff_encoding {enc} {
global current_diff_path
-
+
if {$current_diff_path ne {}} {
force_path_encoding $current_diff_path $enc
reshow_diff
}
}
-proc apply_hunk {x y} {
+proc apply_or_revert_hunk {x y revert} {
global current_diff_path current_diff_header current_diff_side
- global ui_diff ui_index file_states
+ global ui_diff ui_index file_states last_revert last_revert_enc
if {$current_diff_path eq {} || $current_diff_header eq {}} return
if {![lock_index apply_hunk]} return
- set apply_cmd {apply --cached --whitespace=nowarn}
+ set apply_cmd {apply --whitespace=nowarn}
set mi [lindex $file_states($current_diff_path) 0]
if {$current_diff_side eq $ui_index} {
set failed_msg [mc "Failed to unstage selected hunk."]
- lappend apply_cmd --reverse
+ lappend apply_cmd --reverse --cached
if {[string index $mi 0] ne {M}} {
unlock_index
return
}
} else {
- set failed_msg [mc "Failed to stage selected hunk."]
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected hunk."]
+ lappend apply_cmd --reverse
+ } else {
+ set failed_msg [mc "Failed to stage selected hunk."]
+ lappend apply_cmd --cached
+ }
+
if {[string index $mi 1] ne {M}} {
unlock_index
return
set e_lno end
}
+ set wholepatch "$current_diff_header[$ui_diff get $s_lno $e_lno]"
+
if {[catch {
set enc [get_path_encoding $current_diff_path]
set p [eval git_write $apply_cmd]
fconfigure $p -translation binary -encoding $enc
- puts -nonewline $p $current_diff_header
- puts -nonewline $p [$ui_diff get $s_lno $e_lno]
+ puts -nonewline $p $wholepatch
close $p} err]} {
error_popup "$failed_msg\n\n$err"
unlock_index
return
}
+ if {$revert} {
+ # Save a copy of this patch for undoing reverts.
+ set last_revert $wholepatch
+ set last_revert_enc $enc
+ }
+
$ui_diff conf -state normal
$ui_diff delete $s_lno $e_lno
$ui_diff conf -state disabled
+ # Check if the hunk was the last one in the file.
if {[$ui_diff get 1.0 end] eq "\n"} {
set o _
} else {
set o ?
}
- if {$current_diff_side eq $ui_index} {
+ # Update the status flags.
+ if {$revert} {
+ set mi [string index $mi 0]$o
+ } elseif {$current_diff_side eq $ui_index} {
set mi ${o}M
} elseif {[string index $mi 0] eq {_}} {
set mi M$o
}
}
-proc apply_range_or_line {x y} {
+proc apply_or_revert_range_or_line {x y revert} {
global current_diff_path current_diff_header current_diff_side
- global ui_diff ui_index file_states
+ global ui_diff ui_index file_states last_revert
set selected [$ui_diff tag nextrange sel 0.0]
if {$current_diff_path eq {} || $current_diff_header eq {}} return
if {![lock_index apply_hunk]} return
- set apply_cmd {apply --cached --whitespace=nowarn}
+ set apply_cmd {apply --whitespace=nowarn}
set mi [lindex $file_states($current_diff_path) 0]
if {$current_diff_side eq $ui_index} {
set failed_msg [mc "Failed to unstage selected line."]
set to_context {+}
- lappend apply_cmd --reverse
+ lappend apply_cmd --reverse --cached
if {[string index $mi 0] ne {M}} {
unlock_index
return
}
} else {
- set failed_msg [mc "Failed to stage selected line."]
- set to_context {-}
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected line."]
+ set to_context {+}
+ lappend apply_cmd --reverse
+ } else {
+ set failed_msg [mc "Failed to stage selected line."]
+ set to_context {-}
+ lappend apply_cmd --cached
+ }
+
if {[string index $mi 1] ne {M}} {
unlock_index
return
puts -nonewline $p $wholepatch
close $p} err]} {
error_popup "$failed_msg\n\n$err"
+ unlock_index
+ return
+ }
+
+ if {$revert} {
+ # Save a copy of this patch for undoing reverts.
+ set last_revert $current_diff_header$wholepatch
+ set last_revert_enc $enc
}
unlock_index
}
+
+# Undo the last line/hunk reverted. When hunks and lines are reverted, a copy
+# of the diff applied is saved. Re-apply that diff to undo the revert.
+#
+# Right now, we only use a single variable to hold the copy, and not a
+# stack/deque for simplicity, so multiple undos are not possible. Maybe this
+# can be added if the need for something like this is felt in the future.
+proc undo_last_revert {} {
+ global last_revert current_diff_path current_diff_header
+ global last_revert_enc
+
+ if {$last_revert eq {}} return
+ if {![lock_index apply_hunk]} return
+
+ set apply_cmd {apply --whitespace=nowarn}
+ set failed_msg [mc "Failed to undo last revert."]
+
+ if {[catch {
+ set enc $last_revert_enc
+ set p [eval git_write $apply_cmd]
+ fconfigure $p -translation binary -encoding $enc
+ puts -nonewline $p $last_revert
+ close $p} err]} {
+ error_popup "$failed_msg\n\n$err"
+ unlock_index
+ return
+ }
+
+ set last_revert {}
+
+ unlock_index
+}
}
proc do_select_commit_type {} {
- global commit_type selected_commit_type
+ global commit_type commit_type_is_amend
- if {$selected_commit_type eq {new}
+ if {$commit_type_is_amend == 0
&& [string match amend* $commit_type]} {
create_new_commit
- } elseif {$selected_commit_type eq {amend}
+ } elseif {$commit_type_is_amend == 1
&& ![string match amend* $commit_type]} {
load_last_commit
# The amend request was rejected...
#
if {![string match amend* $commit_type]} {
- set selected_commit_type new
+ set commit_type_is_amend 0
}
}
}
}
checkout_staged_file () {
- tmpfile=$(expr \
- "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \
- : '\([^ ]*\) ')
+ tmpfile="$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" &&
+ tmpfile=${tmpfile%%' '*}
if test $? -eq 0 && test -n "$tmpfile"
then
return 1
fi
- if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$')
- then
- ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$')
- else
+ # extract file extension from the last path component
+ case "${MERGED##*/}" in
+ *.*)
+ ext=.${MERGED##*.}
+ BASE=${MERGED%"$ext"}
+ ;;
+ *)
BASE=$MERGED
ext=
- fi
+ esac
mergetool_tmpdir_init
REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
- base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}')
- local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')
- remote_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}')
+ base_mode= local_mode= remote_mode=
+
+ # here, $IFS is just a LF
+ for line in $f
+ do
+ mode=${line%% *} # 1st word
+ sha1=${line#"$mode "}
+ sha1=${sha1%% *} # 2nd word
+ case "${line#$mode $sha1 }" in # remainder
+ '1 '*)
+ base_mode=$mode
+ ;;
+ '2 '*)
+ local_mode=$mode local_sha1=$sha1
+ ;;
+ '3 '*)
+ remote_mode=$mode remote_sha1=$sha1
+ ;;
+ esac
+ done
if is_submodule "$local_mode" || is_submodule "$remote_mode"
then
echo "Submodule merge conflict for '$MERGED':"
- local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
- remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
describe_file "$local_mode" "local" "$local_sha1"
describe_file "$remote_mode" "remote" "$remote_sha1"
resolve_submodule_merge
-t|--tool*)
case "$#,$1" in
*,*=*)
- merge_tool=$(expr "z$1" : 'z-[^=]*=\(.*\)')
+ merge_tool=${1#*=}
;;
1,*)
usage ;;
self.needsGit = True
self.verbose = False
- # This is required for the "append" cloneExclude action
+ # This is required for the "append" update_shelve action
def ensure_value(self, attr, value):
if not hasattr(self, attr) or getattr(self, attr) is None:
setattr(self, attr, value)
die( "Error: %s is not found in client spec path" % depot_path )
return ""
+def cloneExcludeCallback(option, opt_str, value, parser):
+ # prepend "/" because the first "/" was consumed as part of the option itself.
+ # ("-//depot/A/..." becomes "/depot/A/..." after option parsing)
+ parser.values.cloneExclude += ["/" + re.sub(r"\.\.\.$", "", value)]
+
class P4Sync(Command, P4UserMap):
def __init__(self):
optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
help="Only sync files that are included in the Perforce Client Spec"),
optparse.make_option("-/", dest="cloneExclude",
- action="append", type="string",
+ action="callback", callback=cloneExcludeCallback, type="string",
help="exclude depot path"),
]
self.description = """Imports from Perforce into a git repository.\n
if self.verbose:
print("checkpoint finished: " + out)
+ def isPathWanted(self, path):
+ for p in self.cloneExclude:
+ if p.endswith("/"):
+ if p4PathStartsWith(path, p):
+ return False
+ # "-//depot/file1" without a trailing "/" should only exclude "file1", but not "file111" or "file1_dir/file2"
+ elif path.lower() == p.lower():
+ return False
+ for p in self.depotPaths:
+ if p4PathStartsWith(path, p):
+ return True
+ return False
+
def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
- self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
- for path in self.cloneExclude]
files = []
fnum = 0
while "depotFile%s" % fnum in commit:
path = commit["depotFile%s" % fnum]
-
- if [p for p in self.cloneExclude
- if p4PathStartsWith(path, p)]:
- found = False
- else:
- found = [p for p in self.depotPaths
- if p4PathStartsWith(path, p)]
+ found = self.isPathWanted(path)
if not found:
fnum = fnum + 1
continue
path = self.clientSpecDirs.map_in_client(path)
if self.detectBranches:
for b in self.knownBranches:
- if path.startswith(b + "/"):
+ if p4PathStartsWith(path, b + "/"):
path = path[len(b)+1:]
elif self.keepRepoPath:
fnum = 0
while "depotFile%s" % fnum in commit:
path = commit["depotFile%s" % fnum]
- found = [p for p in self.depotPaths
- if p4PathStartsWith(path, p)]
+ found = self.isPathWanted(path)
if not found:
fnum = fnum + 1
continue
for branch in self.knownBranches.keys():
# add a trailing slash so that a commit into qt/4.2foo
# doesn't end up in qt/4.2, e.g.
- if relPath.startswith(branch + "/"):
+ if p4PathStartsWith(relPath, branch + "/"):
if branch not in branches:
branches[branch] = []
branches[branch].append(file)
if currentChange < change:
earliestCommit = "^%s" % next
else:
- latestCommit = "%s" % next
+ if next == latestCommit:
+ die("Infinite loop while looking in ref %s for change %s. Check your branch mappings" % (ref, change))
+ latestCommit = "%s^@" % next
return ""
self.cloneDestination = depotPaths[-1]
depotPaths = depotPaths[:-1]
- self.cloneExclude = ["/"+p for p in self.cloneExclude]
for p in depotPaths:
if not p.startswith("//"):
sys.stderr.write('Depot paths must start with "//": %s\n' % p)
+++ /dev/null
-# This shell script fragment is sourced by git-rebase to implement
-# its default, fast, patch-based, non-interactive mode.
-#
-# Copyright (c) 2010 Junio C Hamano.
-#
-
-git_rebase__am () {
-
-case "$action" in
-continue)
- git am --resolved --resolvemsg="$resolvemsg" \
- ${gpg_sign_opt:+"$gpg_sign_opt"} &&
- move_to_original_branch
- return
- ;;
-skip)
- git am --skip --resolvemsg="$resolvemsg" &&
- move_to_original_branch
- return
- ;;
-show-current-patch)
- exec git am --show-current-patch
- ;;
-esac
-
-if test -z "$rebase_root"
- # this is now equivalent to ! -z "$upstream"
-then
- revisions=$upstream...$orig_head
-else
- revisions=$onto...$orig_head
-fi
-
-ret=0
-rm -f "$GIT_DIR/rebased-patches"
-
-git format-patch -k --stdout --full-index --cherry-pick --right-only \
- --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
- --pretty=mboxrd --topo-order \
- $git_format_patch_opt \
- "$revisions" ${restrict_revision+^$restrict_revision} \
- >"$GIT_DIR/rebased-patches"
-ret=$?
-
-if test 0 != $ret
-then
- rm -f "$GIT_DIR/rebased-patches"
- case "$head_name" in
- refs/heads/*)
- git checkout -q "$head_name"
- ;;
- *)
- git checkout -q "$orig_head"
- ;;
- esac
-
- cat >&2 <<-EOF
-
- git encountered an error while preparing the patches to replay
- these revisions:
-
- $revisions
-
- As a result, git cannot rebase them.
- EOF
- return $ret
-fi
-
-git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
- --patch-format=mboxrd \
- $allow_rerere_autoupdate \
- ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
-ret=$?
-
-rm -f "$GIT_DIR/rebased-patches"
-
-if test 0 != $ret
-then
- test -d "$state_dir" && write_basic_state
- return $ret
-fi
-
-move_to_original_branch
-
-}
+++ /dev/null
-
-resolvemsg="
-$(gettext 'Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".')
-"
-
-write_basic_state () {
- echo "$head_name" > "$state_dir"/head-name &&
- echo "$onto" > "$state_dir"/onto &&
- echo "$orig_head" > "$state_dir"/orig-head &&
- test t = "$GIT_QUIET" && : > "$state_dir"/quiet
- test t = "$verbose" && : > "$state_dir"/verbose
- test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
- test -n "$strategy_opts" && echo "$strategy_opts" > \
- "$state_dir"/strategy_opts
- test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
- "$state_dir"/allow_rerere_autoupdate
- test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
- test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
- test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
-}
-
-apply_autostash () {
- if test -f "$state_dir/autostash"
- then
- stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 >/dev/null 2>&1
- then
- echo "$(gettext 'Applied autostash.')" >&2
- else
- git stash store -m "autostash" -q $stash_sha1 ||
- die "$(eval_gettext "Cannot store \$stash_sha1")"
- gettext 'Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-' >&2
- fi
- fi
-}
-
-move_to_original_branch () {
- case "$head_name" in
- refs/*)
- message="rebase finished: $head_name onto $onto"
- git update-ref -m "$message" \
- $head_name $(git rev-parse HEAD) $orig_head &&
- git symbolic-ref \
- -m "rebase finished: returning to $head_name" \
- HEAD $head_name ||
- die "$(eval_gettext "Could not move back to \$head_name")"
- ;;
- esac
-}
-
-output () {
- case "$verbose" in
- '')
- output=$("$@" 2>&1 )
- status=$?
- test $status != 0 && printf "%s\n" "$output"
- return $status
- ;;
- *)
- "$@"
- ;;
- esac
-}
# and leaves CR at the end instead.
cr=$(printf "\015")
+resolvemsg="
+$(gettext 'Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".')
+"
+
+write_basic_state () {
+ echo "$head_name" > "$state_dir"/head-name &&
+ echo "$onto" > "$state_dir"/onto &&
+ echo "$orig_head" > "$state_dir"/orig-head &&
+ test t = "$GIT_QUIET" && : > "$state_dir"/quiet
+ test t = "$verbose" && : > "$state_dir"/verbose
+ test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
+ test -n "$strategy_opts" && echo "$strategy_opts" > \
+ "$state_dir"/strategy_opts
+ test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
+ "$state_dir"/allow_rerere_autoupdate
+ test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
+ test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
+ test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
+}
+
+apply_autostash () {
+ if test -f "$state_dir/autostash"
+ then
+ stash_sha1=$(cat "$state_dir/autostash")
+ if git stash apply $stash_sha1 >/dev/null 2>&1
+ then
+ echo "$(gettext 'Applied autostash.')" >&2
+ else
+ git stash store -m "autostash" -q $stash_sha1 ||
+ die "$(eval_gettext "Cannot store \$stash_sha1")"
+ gettext 'Applying autostash resulted in conflicts.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+' >&2
+ fi
+ fi
+}
+
+output () {
+ case "$verbose" in
+ '')
+ output=$("$@" 2>&1 )
+ status=$?
+ test $status != 0 && printf "%s\n" "$output"
+ return $status
+ ;;
+ *)
+ "$@"
+ ;;
+ esac
+}
+
strategy_args=${strategy:+--strategy=$strategy}
test -n "$strategy_opts" &&
eval '
my $re_encoded_word = qr/=\?($re_token)\?($re_token)\?($re_encoded_text)\?=/;
# Variables we fill in automatically, or via prompting:
-my (@to,$no_to,@initial_to,@cc,$no_cc,@initial_cc,@bcclist,$no_bcc,@xh,
+my (@to,@cc,@xh,$envelope_sender,
$initial_in_reply_to,$reply_to,$initial_subject,@files,
- $author,$sender,$smtp_authpass,$annotate,$use_xmailer,$compose,$time);
-
-my $envelope_sender;
+ $author,$sender,$smtp_authpass,$annotate,$compose,$time);
+# Things we either get from config, *or* are overridden on the
+# command-line.
+my ($no_cc, $no_to, $no_bcc, $no_identity);
+my (@config_to, @getopt_to);
+my (@config_cc, @getopt_cc);
+my (@config_bcc, @getopt_bcc);
# Example reply to:
#$initial_in_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
}
# Variables with corresponding config settings
-my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc);
+my ($suppress_from, $signed_off_by_cc);
my ($cover_cc, $cover_to);
my ($to_cmd, $cc_cmd);
my ($smtp_server, $smtp_server_port, @smtp_server_options);
my ($smtp_authuser, $smtp_encryption, $smtp_ssl_cert_path);
my ($batch_size, $relogin_delay);
my ($identity, $aliasfiletype, @alias_files, $smtp_domain, $smtp_auth);
-my ($validate, $confirm);
+my ($confirm);
my (@suppress_cc);
my ($auto_8bit_encoding);
my ($compose_encoding);
-my $target_xfer_encoding = 'auto';
-
+# Variables with corresponding config settings & hardcoded defaults
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
+my $thread = 1;
+my $chain_reply_to = 0;
+my $use_xmailer = 1;
+my $validate = 1;
+my $target_xfer_encoding = 'auto';
my %config_bool_settings = (
- "thread" => [\$thread, 1],
- "chainreplyto" => [\$chain_reply_to, 0],
- "suppressfrom" => [\$suppress_from, undef],
- "signedoffbycc" => [\$signed_off_by_cc, undef],
- "cccover" => [\$cover_cc, undef],
- "tocover" => [\$cover_to, undef],
- "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
- "validate" => [\$validate, 1],
- "multiedit" => [\$multiedit, undef],
- "annotate" => [\$annotate, undef],
- "xmailer" => [\$use_xmailer, 1]
+ "thread" => \$thread,
+ "chainreplyto" => \$chain_reply_to,
+ "suppressfrom" => \$suppress_from,
+ "signedoffbycc" => \$signed_off_by_cc,
+ "cccover" => \$cover_cc,
+ "tocover" => \$cover_to,
+ "signedoffcc" => \$signed_off_by_cc,
+ "validate" => \$validate,
+ "multiedit" => \$multiedit,
+ "annotate" => \$annotate,
+ "xmailer" => \$use_xmailer,
);
my %config_settings = (
"smtpauth" => \$smtp_auth,
"smtpbatchsize" => \$batch_size,
"smtprelogindelay" => \$relogin_delay,
- "to" => \@initial_to,
+ "to" => \@config_to,
"tocmd" => \$to_cmd,
- "cc" => \@initial_cc,
+ "cc" => \@config_cc,
"cccmd" => \$cc_cmd,
"aliasfiletype" => \$aliasfiletype,
- "bcc" => \@bcclist,
+ "bcc" => \@config_bcc,
"suppresscc" => \@suppress_cc,
"envelopesender" => \$envelope_sender,
"confirm" => \$confirm,
$SIG{TERM} = \&signal_handler;
$SIG{INT} = \&signal_handler;
+# Read our sendemail.* config
+sub read_config {
+ my ($configured, $prefix) = @_;
+
+ foreach my $setting (keys %config_bool_settings) {
+ my $target = $config_bool_settings{$setting};
+ my $v = Git::config_bool(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+
+ foreach my $setting (keys %config_path_settings) {
+ my $target = $config_path_settings{$setting};
+ if (ref($target) eq "ARRAY") {
+ my @values = Git::config_path(@repo, "$prefix.$setting");
+ next unless @values;
+ next if $configured->{$setting}++;
+ @$target = @values;
+ }
+ else {
+ my $v = Git::config_path(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+ }
+
+ foreach my $setting (keys %config_settings) {
+ my $target = $config_settings{$setting};
+ if (ref($target) eq "ARRAY") {
+ my @values = Git::config(@repo, "$prefix.$setting");
+ next unless @values;
+ next if $configured->{$setting}++;
+ @$target = @values;
+ }
+ else {
+ my $v = Git::config(@repo, "$prefix.$setting");
+ next unless defined $v;
+ next if $configured->{$setting}++;
+ $$target = $v;
+ }
+ }
+
+ if (!defined $smtp_encryption) {
+ my $setting = "$prefix.smtpencryption";
+ my $enc = Git::config(@repo, $setting);
+ return unless defined $enc;
+ return if $configured->{$setting}++;
+ if (defined $enc) {
+ $smtp_encryption = $enc;
+ } elsif (Git::config_bool(@repo, "$prefix.smtpssl")) {
+ $smtp_encryption = 'ssl';
+ }
+ }
+}
+
+# sendemail.identity yields to --identity. We must parse this
+# special-case first before the rest of the config is read.
+$identity = Git::config(@repo, "sendemail.identity");
+my $rc = GetOptions(
+ "identity=s" => \$identity,
+ "no-identity" => \$no_identity,
+);
+usage() unless $rc;
+undef $identity if $no_identity;
+
+# Now we know enough to read the config
+{
+ my %configured;
+ read_config(\%configured, "sendemail.$identity") if defined $identity;
+ read_config(\%configured, "sendemail");
+}
+
# Begin by accumulating all the variables (defined above), that we will end up
# needing, first, from the command line:
my $help;
my $git_completion_helper;
-my $rc = GetOptions("h" => \$help,
- "dump-aliases" => \$dump_aliases);
+$rc = GetOptions("h" => \$help,
+ "dump-aliases" => \$dump_aliases);
usage() unless $rc;
die __("--dump-aliases incompatible with other options\n")
if !$help and $dump_aliases and @ARGV;
"in-reply-to=s" => \$initial_in_reply_to,
"reply-to=s" => \$reply_to,
"subject=s" => \$initial_subject,
- "to=s" => \@initial_to,
+ "to=s" => \@getopt_to,
"to-cmd=s" => \$to_cmd,
"no-to" => \$no_to,
- "cc=s" => \@initial_cc,
+ "cc=s" => \@getopt_cc,
"no-cc" => \$no_cc,
- "bcc=s" => \@bcclist,
+ "bcc=s" => \@getopt_bcc,
"no-bcc" => \$no_bcc,
"chain-reply-to!" => \$chain_reply_to,
"no-chain-reply-to" => sub {$chain_reply_to = 0},
"smtp-domain:s" => \$smtp_domain,
"smtp-auth=s" => \$smtp_auth,
"no-smtp-auth" => sub {$smtp_auth = 'none'},
- "identity=s" => \$identity,
"annotate!" => \$annotate,
"no-annotate" => sub {$annotate = 0},
"compose" => \$compose,
"git-completion-helper" => \$git_completion_helper,
);
+# Munge any "either config or getopt, not both" variables
+my @initial_to = @getopt_to ? @getopt_to : ($no_to ? () : @config_to);
+my @initial_cc = @getopt_cc ? @getopt_cc : ($no_cc ? () : @config_cc);
+my @initial_bcc = @getopt_bcc ? @getopt_bcc : ($no_bcc ? () : @config_bcc);
+
usage() if $help;
completion_helper() if $git_completion_helper;
unless ($rc) {
"(via command-line or configuration option)\n")
if defined $relogin_delay and not defined $batch_size;
-# Now, let's fill any that aren't set in with defaults:
-
-sub read_config {
- my ($prefix) = @_;
-
- foreach my $setting (keys %config_bool_settings) {
- my $target = $config_bool_settings{$setting}->[0];
- $$target = Git::config_bool(@repo, "$prefix.$setting") unless (defined $$target);
- }
-
- foreach my $setting (keys %config_path_settings) {
- my $target = $config_path_settings{$setting};
- if (ref($target) eq "ARRAY") {
- unless (@$target) {
- my @values = Git::config_path(@repo, "$prefix.$setting");
- @$target = @values if (@values && defined $values[0]);
- }
- }
- else {
- $$target = Git::config_path(@repo, "$prefix.$setting") unless (defined $$target);
- }
- }
-
- foreach my $setting (keys %config_settings) {
- my $target = $config_settings{$setting};
- next if $setting eq "to" and defined $no_to;
- next if $setting eq "cc" and defined $no_cc;
- next if $setting eq "bcc" and defined $no_bcc;
- if (ref($target) eq "ARRAY") {
- unless (@$target) {
- my @values = Git::config(@repo, "$prefix.$setting");
- @$target = @values if (@values && defined $values[0]);
- }
- }
- else {
- $$target = Git::config(@repo, "$prefix.$setting") unless (defined $$target);
- }
- }
-
- if (!defined $smtp_encryption) {
- my $enc = Git::config(@repo, "$prefix.smtpencryption");
- if (defined $enc) {
- $smtp_encryption = $enc;
- } elsif (Git::config_bool(@repo, "$prefix.smtpssl")) {
- $smtp_encryption = 'ssl';
- }
- }
-}
-
-# read configuration from [sendemail "$identity"], fall back on [sendemail]
-$identity = Git::config(@repo, "sendemail.identity") unless (defined $identity);
-read_config("sendemail.$identity") if (defined $identity);
-read_config("sendemail");
-
-# fall back on builtin bool defaults
-foreach my $setting (values %config_bool_settings) {
- ${$setting->[0]} = $setting->[1] unless (defined (${$setting->[0]}));
-}
-
# 'default' encryption is none -- this only prevents a warning
$smtp_encryption = '' unless (defined $smtp_encryption);
@initial_to = process_address_list(@initial_to);
@initial_cc = process_address_list(@initial_cc);
-@bcclist = process_address_list(@bcclist);
+@initial_bcc = process_address_list(@initial_bcc);
if ($thread && !defined $initial_in_reply_to && $prompting) {
$initial_in_reply_to = ask(
}
@cc);
my $to = join (",\n\t", @recipients);
- @recipients = unique_email_list(@recipients,@cc,@bcclist);
+ @recipients = unique_email_list(@recipients,@cc,@initial_bcc);
@recipients = (map { extract_valid_address_or_die($_) } @recipients);
my $date = format_2822_time($time++);
my $gitversion = '@@GIT_VERSION@@';
# First decide what scheme to use...
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_TEST_GETTEXT_POISON"
+if test -n "$GIT_TEST_GETTEXT_POISON" &&
+ git env--helper --type=bool --default=0 --exit-code \
+ GIT_TEST_GETTEXT_POISON
then
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
elif test -n "@@USE_GETTEXT_SCHEME@@"
const char git_more_info_string[] =
N_("'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
- "to read about a specific subcommand or concept.");
+ "to read about a specific subcommand or concept.\n"
+ "See 'git help git' for an overview of the system.");
static int use_pager = -1;
{ "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT },
{ "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT },
{ "difftool", cmd_difftool, RUN_SETUP_GENTLY },
+ { "env--helper", cmd_env__helper },
{ "fast-export", cmd_fast_export, RUN_SETUP },
{ "fetch", cmd_fetch, RUN_SETUP },
{ "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT },
{ "push", cmd_push, RUN_SETUP },
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
- /*
- * NEEDSWORK: Until the rebase is independent and needs no redirection
- * to rebase shell script this is kept as is, then should be changed to
- * RUN_SETUP | NEED_WORK_TREE
- */
- { "rebase", cmd_rebase },
+ { "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "replace", cmd_replace, RUN_SETUP },
{ "rerere", cmd_rerere, RUN_SETUP },
{ "reset", cmd_reset, RUN_SETUP },
+ { "restore", cmd_restore, RUN_SETUP | NEED_WORK_TREE },
{ "rev-list", cmd_rev_list, RUN_SETUP | NO_PARSEOPT },
{ "rev-parse", cmd_rev_parse, NO_PARSEOPT },
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
{ "stripspace", cmd_stripspace },
{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT },
+ { "switch", cmd_switch, RUN_SETUP | NEED_WORK_TREE },
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
{ "unpack-file", cmd_unpack_file, RUN_SETUP | NO_PARSEOPT },
*/
if (!done_alias)
handle_builtin(*argcp, *argv);
-
-#if 0 // TODO In GFW, need to amend a7924b655e940b06cb547c235d6bed9767929673 to include trace2_ and _tr2 lines.
else if (get_builtin(**argv)) {
struct argv_array args = ARGV_ARRAY_INIT;
int i;
exit(i);
die("could not execute builtin %s", **argv);
}
-#endif // a7924b655e940b06cb547c235d6bed9767929673
/* .. then try the external ones */
execv_dashed_external(*argv);
VALUE "Translation", 0x409, 1200
END
END
+
+1 RT_MANIFEST "compat/win32/git.manifest"
}
image create bitmap reficon-H -background black -foreground "#00ff00" \
-data $rectdata -maskdata $rectmask
+image create bitmap reficon-R -background black -foreground "#ffddaa" \
+ -data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
+# Also look for URLs of the form "http[s]://..." and make them web links.
proc appendwithlinks {text tags} {
global ctext linknum curview
setlink $linkid link$linknum
incr linknum
}
+ set wlinks [regexp -indices -all -inline -line \
+ {https?://[^[:space:]]+} $text]
+ foreach l $wlinks {
+ set s2 [lindex $l 0]
+ set e2 [lindex $l 1]
+ set url [string range $text $s2 $e2]
+ incr e2
+ $ctext tag delete link$linknum
+ $ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c"
+ setwlink $url link$linknum
+ incr linknum
+ }
}
proc setlink {id lk} {
}
}
+proc setwlink {url lk} {
+ global ctext
+ global linkfgcolor
+ global web_browser
+
+ if {$web_browser eq {}} return
+ $ctext tag conf $lk -foreground $linkfgcolor -underline 1
+ $ctext tag bind $lk <1> [list browseweb $url]
+ $ctext tag bind $lk <Enter> {linkcursor %W 1}
+ $ctext tag bind $lk <Leave> {linkcursor %W -1}
+}
+
proc appendshortlink {id {pre {}} {post {}}} {
global ctext linknum
}
}
+proc browseweb {url} {
+ global web_browser
+
+ if {$web_browser eq {}} return
+ # Use eval here in case $web_browser is a command plus some arguments
+ if {[catch {eval exec $web_browser [list $url] &} err]} {
+ error_popup "[mc "Error starting web browser:"] $err"
+ }
+}
+
proc viewnextline {dir} {
global canv linespc
} else {
$ctext insert end "$line\n" filesep
}
- } elseif {![string compare -length 3 " >" $line]} {
+ } elseif {$currdiffsubmod != "" && ![string compare -length 3 " >" $line]} {
set $currdiffsubmod ""
set line [encoding convertfrom $diffencoding $line]
$ctext insert end "$line\n" dresult
- } elseif {![string compare -length 3 " <" $line]} {
+ } elseif {$currdiffsubmod != "" && ![string compare -length 3 " <" $line]} {
set $currdiffsubmod ""
set line [encoding convertfrom $diffencoding $line]
$ctext insert end "$line\n" d0
set n [lindex $ref 0]
switch -- [lindex $ref 1] {
"H" {selbyid $headids($n)}
+ "R" {selbyid $headids($n)}
"T" {selbyid $tagids($n)}
"o" {selbyid $otherrefids($n)}
}
foreach n [array names headids] {
if {[string match $reflistfilter $n]} {
if {[commitinview $headids($n) $curview]} {
- lappend refs [list $n H]
+ if {[string match "remotes/*" $n]} {
+ lappend refs [list $n R]
+ } else {
+ lappend refs [list $n H]
+ }
} else {
interestedin $headids($n) {run refill_reflist}
}
proc prefspage_general {notebook} {
global NS maxwidth maxgraphpct showneartags showlocalchanges
global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
- global hideremotes want_ttk have_ttk maxrefs
+ global hideremotes want_ttk have_ttk maxrefs web_browser
set page [create_prefs_page $notebook.general]
pack configure $page.extdifff.l -padx 10
grid x $page.extdifff $page.extdifft -sticky ew
+ ${NS}::entry $page.webbrowser -textvariable web_browser
+ ${NS}::frame $page.webbrowserf
+ ${NS}::label $page.webbrowserf.l -text [mc "Web browser" ]
+ pack $page.webbrowserf.l -side left
+ pack configure $page.webbrowserf.l -padx 10
+ grid x $page.webbrowserf $page.webbrowser -sticky ew
+
${NS}::label $page.lgen -text [mc "General options"]
grid $page.lgen - -sticky w -pady 10
${NS}::checkbutton $page.want_ttk -variable want_ttk \
set bgcolor SystemWindow
set fgcolor SystemWindowText
set selectbgcolor SystemHighlight
+ set web_browser "cmd /c start"
} else {
set uicolor grey85
set uifgcolor black
set bgcolor white
set fgcolor black
set selectbgcolor gray85
+ if {[tk windowingsystem] eq "aqua"} {
+ set web_browser "open"
+ } else {
+ set web_browser "xdg-open"
+ }
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
indexcirclecolor circlecolors linkfgcolor circleoutlinecolor
+ web_browser
}
foreach var $config_variables {
config_init_trace $var
--- /dev/null
+# Translation of gitk to Simplified Chinese.
+#
+# Translators:
+# YanKe <imyanke@163.com>, 2017
+
+msgid ""
+msgstr ""
+"Project-Id-Version: Git Chinese Localization Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-28 23:11+0800\n"
+"PO-Revision-Date: 2017-03-11 02:27+0800\n"
+"Last-Translator: YanKe <imyanke@163.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "不能获取未合并文件列表："
+
+#: gitk:212 gitk:2403
+msgid "Color words"
+msgstr "着色显示差异"
+
+#: gitk:217 gitk:2403 gitk:8249 gitk:8282
+msgid "Markup words"
+msgstr "标记显示差异"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "解析版本错误："
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "运行 --argscmd命令出错"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr "没有选中文件：--指定merge参数但没有未合并的文件。"
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr "没有选中文件：--指定merge参数但没有未合并的文件在文件中"
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "执行git log命令出错："
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "读取中"
+
+#: gitk:496 gitk:4549
+msgid "Reading commits..."
+msgstr "提交记录读取中..."
+
+#: gitk:499 gitk:1641 gitk:4552
+msgid "No commits selected"
+msgstr "未选中任何提交"
+
+#: gitk:1449 gitk:4069 gitk:12583
+msgid "Command line"
+msgstr "命令行"
+
+#: gitk:1515
+msgid "Can't parse git log output:"
+msgstr "不能解析git log输出："
+
+#: gitk:1744
+msgid "No commit information available"
+msgstr "无可用提交信息"
+
+#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
+msgid "OK"
+msgstr "确定"
+
+#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
+#: gitk:11389 gitk:11669
+msgid "Cancel"
+msgstr "取消"
+
+#: gitk:2087
+msgid "&Update"
+msgstr "更新"
+
+#: gitk:2088
+msgid "&Reload"
+msgstr "重新加载"
+
+#: gitk:2089
+msgid "Reread re&ferences"
+msgstr "重新读取引用"
+
+#: gitk:2090
+msgid "&List references"
+msgstr "列出引用(分支以及tag)"
+
+#: gitk:2092
+msgid "Start git &gui"
+msgstr "启动git gui客户端"
+
+#: gitk:2094
+msgid "&Quit"
+msgstr "退出"
+
+#: gitk:2086
+msgid "&File"
+msgstr "文件"
+
+#: gitk:2098
+msgid "&Preferences"
+msgstr "偏好设置"
+
+#: gitk:2097
+msgid "&Edit"
+msgstr "编辑"
+
+#: gitk:2102
+msgid "&New view..."
+msgstr "新视图..."
+
+#: gitk:2103
+msgid "&Edit view..."
+msgstr "编辑视图..."
+
+#: gitk:2104
+msgid "&Delete view"
+msgstr "删除视图"
+
+#: gitk:2106
+msgid "&All files"
+msgstr "所有文件"
+
+#: gitk:2101
+msgid "&View"
+msgstr "视图"
+
+#: gitk:2111 gitk:2121
+msgid "&About gitk"
+msgstr "关于gitk"
+
+#: gitk:2112 gitk:2126
+msgid "&Key bindings"
+msgstr "快捷键"
+
+#: gitk:2110 gitk:2125
+msgid "&Help"
+msgstr "帮助"
+
+#: gitk:2203 gitk:8681
+msgid "SHA1 ID:"
+msgstr "SHA1 ID："
+
+#: gitk:2247
+msgid "Row"
+msgstr "行"
+
+#: gitk:2285
+msgid "Find"
+msgstr "查找"
+
+#: gitk:2313
+msgid "commit"
+msgstr "提交"
+
+#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
+#: gitk:6936
+msgid "containing:"
+msgstr "包含："
+
+#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
+msgid "touching paths:"
+msgstr "影响路径："
+
+#: gitk:2321 gitk:4801
+msgid "adding/removing string:"
+msgstr "增加/删除字符串："
+
+#: gitk:2322 gitk:4803
+msgid "changing lines matching:"
+msgstr "改变行匹配："
+
+#: gitk:2331 gitk:2333 gitk:4790
+msgid "Exact"
+msgstr "精确匹配"
+
+#: gitk:2333 gitk:4878 gitk:6747
+msgid "IgnCase"
+msgstr "忽略大小写"
+
+#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
+msgid "Regexp"
+msgstr "正则"
+
+#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
+msgid "All fields"
+msgstr "所有字段"
+
+#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
+msgid "Headline"
+msgstr "标题"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
+msgid "Comments"
+msgstr "提交注释"
+
+#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
+#: gitk:8874
+msgid "Author"
+msgstr "作者"
+
+#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
+msgid "Committer"
+msgstr "提交者"
+
+#: gitk:2371
+msgid "Search"
+msgstr "搜索"
+
+#: gitk:2379
+msgid "Diff"
+msgstr "差异"
+
+#: gitk:2381
+msgid "Old version"
+msgstr "老版本"
+
+#: gitk:2383
+msgid "New version"
+msgstr "新版本"
+
+#: gitk:2386
+msgid "Lines of context"
+msgstr "Diff上下文显示行数"
+
+#: gitk:2396
+msgid "Ignore space change"
+msgstr "忽略空格修改"
+
+#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
+msgid "Line diff"
+msgstr "按行显示差异"
+
+#: gitk:2467
+msgid "Patch"
+msgstr "补丁"
+
+#: gitk:2469
+msgid "Tree"
+msgstr "树"
+
+#: gitk:2639 gitk:2660
+msgid "Diff this -> selected"
+msgstr "比较从当前提交到选中提交的差异"
+
+#: gitk:2640 gitk:2661
+msgid "Diff selected -> this"
+msgstr "比较从选中提交到当前提交的差异"
+
+#: gitk:2641 gitk:2662
+msgid "Make patch"
+msgstr "制作补丁"
+
+#: gitk:2642 gitk:9283
+msgid "Create tag"
+msgstr "创建tag"
+
+#: gitk:2643
+msgid "Copy commit summary"
+msgstr "复制提交摘要"
+
+#: gitk:2644 gitk:9414
+msgid "Write commit to file"
+msgstr "写入提交到文件"
+
+#: gitk:2645
+msgid "Create new branch"
+msgstr "创建新分支"
+
+#: gitk:2646
+msgid "Cherry-pick this commit"
+msgstr "在此提交运用补丁(cherry-pick)命令"
+
+#: gitk:2647
+msgid "Reset HEAD branch to here"
+msgstr "将分支头(HEAD)重置到此处"
+
+#: gitk:2648
+msgid "Mark this commit"
+msgstr "标记此提交"
+
+#: gitk:2649
+msgid "Return to mark"
+msgstr "返回到标记"
+
+#: gitk:2650
+msgid "Find descendant of this and mark"
+msgstr "查找本次提交的子提交并标记"
+
+#: gitk:2651
+msgid "Compare with marked commit"
+msgstr "和已标记的提交作比较"
+
+#: gitk:2652 gitk:2663
+msgid "Diff this -> marked commit"
+msgstr "比较从当前提交到已标记提交的差异"
+
+#: gitk:2653 gitk:2664
+msgid "Diff marked commit -> this"
+msgstr "比较从已标记提交到当前提交的差异"
+
+#: gitk:2654
+msgid "Revert this commit"
+msgstr "撤销(revert)此提交"
+
+#: gitk:2670
+msgid "Check out this branch"
+msgstr "检出(checkout)此分支"
+
+#: gitk:2671
+msgid "Rename this branch"
+msgstr "重命名(Rename)此分支"
+
+#: gitk:2672
+msgid "Remove this branch"
+msgstr "删除(Remove)此分支"
+
+#: gitk:2673
+msgid "Copy branch name"
+msgstr "复制分支名称"
+
+#: gitk:2680
+msgid "Highlight this too"
+msgstr "高亮此处"
+
+#: gitk:2681
+msgid "Highlight this only"
+msgstr "只高亮此处"
+
+#: gitk:2682
+msgid "External diff"
+msgstr "外部diff"
+
+#: gitk:2683
+msgid "Blame parent commit"
+msgstr "Blame父提交"
+
+#: gitk:2684
+msgid "Copy path"
+msgstr "复制路径"
+
+#: gitk:2691
+msgid "Show origin of this line"
+msgstr "显示此行原始提交"
+
+#: gitk:2692
+msgid "Run git gui blame on this line"
+msgstr "在此行运行git gui客户端的blame"
+
+#: gitk:3036
+msgid "About gitk"
+msgstr "关于gitk"
+
+#: gitk:3038
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2016 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr "\nGitk — 一个git的提交查看器\n\n© 2005-2016 Paul Mackerras\n\n在GNU许可证下使用以及分发"
+
+#: gitk:3046 gitk:3113 gitk:10004
+msgid "Close"
+msgstr "关闭"
+
+#: gitk:3067
+msgid "Gitk key bindings"
+msgstr "Gitk快捷键"
+
+#: gitk:3070
+msgid "Gitk key bindings:"
+msgstr "Gitk快捷键："
+
+#: gitk:3072
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\t退出"
+
+#: gitk:3073
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\t关闭窗口"
+
+#: gitk:3074
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\t移动到第一次提交"
+
+#: gitk:3075
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\t移动到最后一次提交"
+
+#: gitk:3076
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, k\t移动到上一次提交"
+
+#: gitk:3077
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, j\t移动到下一次提交"
+
+#: gitk:3078
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, h\t历史列表的上一项"
+
+#: gitk:3079
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\t历史列表的下一项"
+
+#: gitk:3080
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr "<%s-n>\t在历史列表中前往本次提交的第n个父提交"
+
+#: gitk:3081
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\t上一页提交列表"
+
+#: gitk:3082
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\t下一页提交列表"
+
+#: gitk:3083
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\t滚动到提交列表顶部"
+
+#: gitk:3084
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\t滚动到提交列表底部"
+
+#: gitk:3085
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\t向上滚动一行提交列表"
+
+#: gitk:3086
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\t向下滚动一行提交列表"
+
+#: gitk:3087
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\t向上滚动一页提交列表"
+
+#: gitk:3088
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\t向下滚动一页提交列表"
+
+#: gitk:3089
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\t向后查找(向上的，更晚的提交)"
+
+#: gitk:3090
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Down>\t向前查找(向下的，更早的提交)"
+
+#: gitk:3091
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\t向上滚动diff视图一页"
+
+#: gitk:3092
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\t向上滚动diff视图一页"
+
+#: gitk:3093
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Space>\t\t向下滚动diff视图一页"
+
+#: gitk:3094
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\t向上滚动diff视图18行"
+
+#: gitk:3095
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\t向下滚动diff视图18行"
+
+#: gitk:3096
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\t查找"
+
+#: gitk:3097
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\t移动到下一次查找命中"
+
+#: gitk:3098
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\t移动到下一次查找命中"
+
+#: gitk:3099
+msgid "g\t\tGo to commit"
+msgstr "g\t\t转到提交"
+
+#: gitk:3100
+msgid "/\t\tFocus the search box"
+msgstr "/\t\t选中搜索框"
+
+#: gitk:3101
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\t移动到上一次查找命中"
+
+#: gitk:3102
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\t滚动diff视图到下一个文件"
+
+#: gitk:3103
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\t在diff视图中查找下一此命中"
+
+#: gitk:3104
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\t在diff视图中查找上一次命中"
+
+#: gitk:3105
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\t增大字体大小"
+
+#: gitk:3106
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\t增大字体大小"
+
+#: gitk:3107
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\t减小字体大小"
+
+#: gitk:3108
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\t减小字体大小"
+
+#: gitk:3109
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\t更新"
+
+#: gitk:3574 gitk:3583
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "创建临时目录出错%s："
+
+#: gitk:3596
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "从%s获取\"%s\"出错："
+
+#: gitk:3659
+msgid "command failed:"
+msgstr "执行命令失败："
+
+#: gitk:3808
+msgid "No such commit"
+msgstr "无此提交"
+
+#: gitk:3822
+msgid "git gui blame: command failed:"
+msgstr "git gui blame：执行命令失败："
+
+#: gitk:3853
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "不能读取合并头(merge head)：%s"
+
+#: gitk:3861
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "读取索引出错：%s"
+
+#: gitk:3886
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "不能执行git blame：%s"
+
+#: gitk:3889 gitk:6778
+msgid "Searching"
+msgstr "搜索中"
+
+#: gitk:3921
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "运行git blame出错：%s"
+
+#: gitk:3949
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr "此行来自提交%s，不在此视图中"
+
+#: gitk:3963
+msgid "External diff viewer failed:"
+msgstr "外部diff查看器失败："
+
+#: gitk:4067
+msgid "All files"
+msgstr "所有文件"
+
+#: gitk:4091
+msgid "View"
+msgstr "视图"
+
+#: gitk:4094
+msgid "Gitk view definition"
+msgstr "Gitk视图定义"
+
+#: gitk:4098
+msgid "Remember this view"
+msgstr "记住此视图"
+
+#: gitk:4099
+msgid "References (space separated list):"
+msgstr "引用(空格切分的列表)："
+
+#: gitk:4100
+msgid "Branches & tags:"
+msgstr "分支和tags"
+
+#: gitk:4101
+msgid "All refs"
+msgstr "所有引用"
+
+#: gitk:4102
+msgid "All (local) branches"
+msgstr "所有(本地)分支"
+
+#: gitk:4103
+msgid "All tags"
+msgstr "所有tag"
+
+#: gitk:4104
+msgid "All remote-tracking branches"
+msgstr "所有远程跟踪分支"
+
+#: gitk:4105
+msgid "Commit Info (regular expressions):"
+msgstr "提交信息 (正则表达式)："
+
+#: gitk:4106
+msgid "Author:"
+msgstr "作者："
+
+#: gitk:4107
+msgid "Committer:"
+msgstr "提交者："
+
+#: gitk:4108
+msgid "Commit Message:"
+msgstr "提交信息："
+
+#: gitk:4109
+msgid "Matches all Commit Info criteria"
+msgstr "匹配所有提交信息标准"
+
+#: gitk:4110
+msgid "Matches no Commit Info criteria"
+msgstr "匹配无提交信息标准"
+
+#: gitk:4111
+msgid "Changes to Files:"
+msgstr "文件修改列表："
+
+#: gitk:4112
+msgid "Fixed String"
+msgstr "固定字符串"
+
+#: gitk:4113
+msgid "Regular Expression"
+msgstr "正则表达式："
+
+#: gitk:4114
+msgid "Search string:"
+msgstr "搜索字符串："
+
+#: gitk:4115
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):"
+
+#: gitk:4116
+msgid "Since:"
+msgstr "自："
+
+#: gitk:4117
+msgid "Until:"
+msgstr "到："
+
+#: gitk:4118
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "限制 且/或 跳过一定数量的版本(正整数)："
+
+#: gitk:4119
+msgid "Number to show:"
+msgstr "显示数量："
+
+#: gitk:4120
+msgid "Number to skip:"
+msgstr "跳过数量："
+
+#: gitk:4121
+msgid "Miscellaneous options:"
+msgstr "其他选项："
+
+#: gitk:4122
+msgid "Strictly sort by date"
+msgstr "严格按日期整理"
+
+#: gitk:4123
+msgid "Mark branch sides"
+msgstr "标记分支边界"
+
+#: gitk:4124
+msgid "Limit to first parent"
+msgstr "限制到第一个父提交"
+
+#: gitk:4125
+msgid "Simple history"
+msgstr "简易历史"
+
+#: gitk:4126
+msgid "Additional arguments to git log:"
+msgstr "git log命令的额外参数："
+
+#: gitk:4127
+msgid "Enter files and directories to include, one per line:"
+msgstr "输入文件和文件夹来引用，每行一个："
+
+#: gitk:4128
+msgid "Command to generate more commits to include:"
+msgstr "命令产生更多的提交来引用："
+
+#: gitk:4252
+msgid "Gitk: edit view"
+msgstr "Gitk: 编辑视图"
+
+#: gitk:4260
+msgid "-- criteria for selecting revisions"
+msgstr "-- 用来选择版本的规则"
+
+#: gitk:4265
+msgid "View Name"
+msgstr "视图名称"
+
+#: gitk:4340
+msgid "Apply (F5)"
+msgstr "应用(F5)"
+
+#: gitk:4378
+msgid "Error in commit selection arguments:"
+msgstr "提交选择参数错误："
+
+#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
+msgid "None"
+msgstr "无"
+
+#: gitk:5045 gitk:5050
+msgid "Descendant"
+msgstr "子提交"
+
+#: gitk:5046
+msgid "Not descendant"
+msgstr "非子提交"
+
+#: gitk:5053 gitk:5058
+msgid "Ancestor"
+msgstr "父提交"
+
+#: gitk:5054
+msgid "Not ancestor"
+msgstr "非父提交"
+
+#: gitk:5348
+msgid "Local changes checked in to index but not committed"
+msgstr "已添加到索引但未提交的修改"
+
+#: gitk:5384
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "未添加到索引且未提交的修改"
+
+#: gitk:7158
+msgid "and many more"
+msgstr "更多"
+
+#: gitk:7161
+msgid "many"
+msgstr "很多"
+
+#: gitk:7352
+msgid "Tags:"
+msgstr "Tags:"
+
+#: gitk:7369 gitk:7375 gitk:8854
+msgid "Parent"
+msgstr "父节点"
+
+#: gitk:7380
+msgid "Child"
+msgstr "子节点"
+
+#: gitk:7389
+msgid "Branch"
+msgstr "分支"
+
+#: gitk:7392
+msgid "Follows"
+msgstr "之后的tag"
+
+#: gitk:7395
+msgid "Precedes"
+msgstr "之前的tag"
+
+#: gitk:7990
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "获取差异错误：%s"
+
+#: gitk:8679
+msgid "Goto:"
+msgstr "转到："
+
+#: gitk:8700
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "短格式的SHA1提交号%s不明确、有歧义"
+
+#: gitk:8707
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "版本%s未知"
+
+#: gitk:8717
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "提交号(SHA1 id)%s未知"
+
+#: gitk:8719
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "版本%s不在当前视图中"
+
+#: gitk:8861 gitk:8876
+msgid "Date"
+msgstr "日期"
+
+#: gitk:8864
+msgid "Children"
+msgstr "子节点"
+
+#: gitk:8927
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "重置分支%s到此处"
+
+#: gitk:8929
+msgid "Detached head: can't reset"
+msgstr "分离的头(head)：不能重置(reset)"
+
+#: gitk:9034 gitk:9040
+msgid "Skipping merge commit "
+msgstr "跳过合并提交"
+
+#: gitk:9049 gitk:9054
+msgid "Error getting patch ID for "
+msgstr "获取补丁ID出错"
+
+#: gitk:9050 gitk:9055
+msgid " - stopping\n"
+msgstr " — 停止中\n"
+
+#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
+msgid "Commit "
+msgstr "提交"
+
+#: gitk:9064
+msgid ""
+" is the same patch as\n"
+" "
+msgstr " 是相同的补丁(patch)\n "
+
+#: gitk:9072
+msgid ""
+" differs from\n"
+" "
+msgstr " 差异来自\n "
+
+#: gitk:9074
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr "提交的差异(Diff)：\n\n"
+
+#: gitk:9086 gitk:9095
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr "有%s子节点 — 停止中\n"
+
+#: gitk:9114
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "写入提交到文件出错：%s"
+
+#: gitk:9120
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "比较提交差异出错：%s"
+
+#: gitk:9166
+msgid "Top"
+msgstr "顶部"
+
+#: gitk:9167
+msgid "From"
+msgstr "从"
+
+#: gitk:9172
+msgid "To"
+msgstr "到"
+
+#: gitk:9196
+msgid "Generate patch"
+msgstr "生成补丁(patch)"
+
+#: gitk:9198
+msgid "From:"
+msgstr "从："
+
+#: gitk:9207
+msgid "To:"
+msgstr "到："
+
+#: gitk:9216
+msgid "Reverse"
+msgstr "反向(Reverse)"
+
+#: gitk:9218 gitk:9428
+msgid "Output file:"
+msgstr "输出文件："
+
+#: gitk:9224
+msgid "Generate"
+msgstr "生成"
+
+#: gitk:9262
+msgid "Error creating patch:"
+msgstr "创建补丁(patch)出错："
+
+#: gitk:9285 gitk:9416 gitk:9504
+msgid "ID:"
+msgstr "ID:"
+
+#: gitk:9294
+msgid "Tag name:"
+msgstr "Tag名称："
+
+#: gitk:9297
+msgid "Tag message is optional"
+msgstr "Tag信息是可选的"
+
+#: gitk:9299
+msgid "Tag message:"
+msgstr "Tag信息："
+
+#: gitk:9303 gitk:9474
+msgid "Create"
+msgstr "创建"
+
+#: gitk:9321
+msgid "No tag name specified"
+msgstr "未指定tag名称"
+
+#: gitk:9325
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Tag\"%s\"已经存在"
+
+#: gitk:9335
+msgid "Error creating tag:"
+msgstr "创建tag出错："
+
+#: gitk:9425
+msgid "Command:"
+msgstr "命令："
+
+#: gitk:9433
+msgid "Write"
+msgstr "写入"
+
+#: gitk:9451
+msgid "Error writing commit:"
+msgstr "写入提交出错："
+
+#: gitk:9473
+msgid "Create branch"
+msgstr "创建分支"
+
+#: gitk:9489
+#, tcl-format
+msgid "Rename branch %s"
+msgstr "重命名分支%s"
+
+#: gitk:9490
+msgid "Rename"
+msgstr "重命名"
+
+#: gitk:9514
+msgid "Name:"
+msgstr "名称："
+
+#: gitk:9538
+msgid "Please specify a name for the new branch"
+msgstr "请指定新分支的名称"
+
+#: gitk:9543
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "分支\"%s\"已经存在。覆盖它？"
+
+#: gitk:9587
+msgid "Please specify a new name for the branch"
+msgstr "请重新指定新分支的名称"
+
+#: gitk:9650
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "提交%s已经存在于分支%s。确定重新应用它？"
+
+#: gitk:9655
+msgid "Cherry-picking"
+msgstr "打补丁中(Cherry-picking)"
+
+#: gitk:9664
+#, tcl-format
+msgid ""
+"Cherry-pick failed because of local changes to file '%s'.\n"
+"Please commit, reset or stash your changes and try again."
+msgstr "打补丁(Cherry-pick)失败，因为本地修改了文件\"%s\"。\n请提交(commit)、重置(reset)或暂存(stash)修改后重试。"
+
+#: gitk:9670
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr "打补丁(Cherry-pick)失败因为合并冲突。\n你是否希望运行git citool 来解决冲突？"
+
+#: gitk:9686 gitk:9744
+msgid "No changes committed"
+msgstr "无已经提交的修改"
+
+#: gitk:9713
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "提交%s不包含在分支%s中，确认回滚(revert)它？"
+
+#: gitk:9718
+msgid "Reverting"
+msgstr "回滚中(Reverting)"
+
+#: gitk:9726
+#, tcl-format
+msgid ""
+"Revert failed because of local changes to the following files:%s Please "
+"commit, reset or stash your changes and try again."
+msgstr "回滚(revert)失败，因为如下的本地文件修改：%s\n请提交(commit)、重置(reset)或者暂存(stash)改变后重试。"
+
+#: gitk:9730
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr "回滚(revert)失败，因为合并冲突。\n你是否希望运行git citool来解决冲突？"
+
+#: gitk:9773
+msgid "Confirm reset"
+msgstr "确认重置(reset)"
+
+#: gitk:9775
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "重置(reset)分支%s到%s？"
+
+#: gitk:9777
+msgid "Reset type:"
+msgstr "重置(reset)类型："
+
+#: gitk:9780
+msgid "Soft: Leave working tree and index untouched"
+msgstr "软性：离开工作树，索引未改变"
+
+#: gitk:9783
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "混合：离开工作树(未改变)，索引重置"
+
+#: gitk:9786
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr "硬性：重置工作树和索引\n(丢弃所有的本地修改)"
+
+#: gitk:9803
+msgid "Resetting"
+msgstr "重置中(Resetting)"
+
+#: gitk:9876
+#, tcl-format
+msgid "A local branch named %s exists already"
+msgstr "本地分支%s已经存在"
+
+#: gitk:9884
+msgid "Checking out"
+msgstr "检出中(Checking out)"
+
+#: gitk:9943
+msgid "Cannot delete the currently checked-out branch"
+msgstr "不能删除当前检出(checkout)分支"
+
+#: gitk:9949
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr "在分支%s上的提交不在其他任何分支上。\n确认删除分支%s？"
+
+#: gitk:9980
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Tags和头指针(heads)：%s"
+
+#: gitk:9997
+msgid "Filter"
+msgstr "过滤器"
+
+#: gitk:10293
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr "读取提交拓扑信息出错；分支和之前/之后的tag信息将不能完成。"
+
+#: gitk:11270
+msgid "Tag"
+msgstr "标签(Tag)"
+
+#: gitk:11274
+msgid "Id"
+msgstr "Id"
+
+#: gitk:11357
+msgid "Gitk font chooser"
+msgstr "Gitk字体选择"
+
+#: gitk:11374
+msgid "B"
+msgstr "粗体"
+
+#: gitk:11377
+msgid "I"
+msgstr "斜体"
+
+#: gitk:11495
+msgid "Commit list display options"
+msgstr "提交列表展示选项"
+
+#: gitk:11498
+msgid "Maximum graph width (lines)"
+msgstr "最大图宽度(行数)"
+
+#: gitk:11502
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "最大图宽度(%窗口百分比)"
+
+#: gitk:11505
+msgid "Show local changes"
+msgstr "显示本地修改"
+
+#: gitk:11508
+msgid "Auto-select SHA1 (length)"
+msgstr "自动选择SHA1(长度)"
+
+#: gitk:11512
+msgid "Hide remote refs"
+msgstr "隐藏远程引用"
+
+#: gitk:11516
+msgid "Diff display options"
+msgstr "差异(Diff)展示选项"
+
+#: gitk:11518
+msgid "Tab spacing"
+msgstr "制表符宽度"
+
+#: gitk:11521
+msgid "Display nearby tags/heads"
+msgstr "显示临近的tags/heads"
+
+#: gitk:11524
+msgid "Maximum # tags/heads to show"
+msgstr "最大tags/heads展示数量"
+
+#: gitk:11527
+msgid "Limit diffs to listed paths"
+msgstr "diff中列出文件限制"
+
+#: gitk:11530
+msgid "Support per-file encodings"
+msgstr "单独文件编码支持"
+
+#: gitk:11536 gitk:11683
+msgid "External diff tool"
+msgstr "外部差异(diff)工具"
+
+#: gitk:11537
+msgid "Choose..."
+msgstr "选择..."
+
+#: gitk:11542
+msgid "General options"
+msgstr "常规选项"
+
+#: gitk:11545
+msgid "Use themed widgets"
+msgstr "使用主题小部件"
+
+#: gitk:11547
+msgid "(change requires restart)"
+msgstr "(需重启生效)"
+
+#: gitk:11549
+msgid "(currently unavailable)"
+msgstr "(当前不可用)"
+
+#: gitk:11560
+msgid "Colors: press to choose"
+msgstr "颜色：点击来选择"
+
+#: gitk:11563
+msgid "Interface"
+msgstr "界面"
+
+#: gitk:11564
+msgid "interface"
+msgstr "界面"
+
+#: gitk:11567
+msgid "Background"
+msgstr "背景"
+
+#: gitk:11568 gitk:11598
+msgid "background"
+msgstr "背景"
+
+#: gitk:11571
+msgid "Foreground"
+msgstr "前景"
+
+#: gitk:11572
+msgid "foreground"
+msgstr "前景"
+
+#: gitk:11575
+msgid "Diff: old lines"
+msgstr "差异(Diff)：老代码行"
+
+#: gitk:11576
+msgid "diff old lines"
+msgstr "差异(diff)老代码行"
+
+#: gitk:11580
+msgid "Diff: new lines"
+msgstr "差异(Diff)：新代码行"
+
+#: gitk:11581
+msgid "diff new lines"
+msgstr "差异(diff)新代码行"
+
+#: gitk:11585
+msgid "Diff: hunk header"
+msgstr "差异(Diff)：补丁片段头信息"
+
+#: gitk:11587
+msgid "diff hunk header"
+msgstr "差异(diff)补丁片段头信息"
+
+#: gitk:11591
+msgid "Marked line bg"
+msgstr "已标记代码行背景"
+
+#: gitk:11593
+msgid "marked line background"
+msgstr "已标记代码行背景"
+
+#: gitk:11597
+msgid "Select bg"
+msgstr "选择背景"
+
+#: gitk:11606
+msgid "Fonts: press to choose"
+msgstr "字体：点击来选择"
+
+#: gitk:11608
+msgid "Main font"
+msgstr "主字体"
+
+#: gitk:11609
+msgid "Diff display font"
+msgstr "差异(Diff)显示字体"
+
+#: gitk:11610
+msgid "User interface font"
+msgstr "用户界面字体"
+
+#: gitk:11632
+msgid "Gitk preferences"
+msgstr "Gitk偏好设置"
+
+#: gitk:11641
+msgid "General"
+msgstr "常规"
+
+#: gitk:11642
+msgid "Colors"
+msgstr "颜色"
+
+#: gitk:11643
+msgid "Fonts"
+msgstr "字体"
+
+#: gitk:11693
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk：选择颜色用于%s"
+
+#: gitk:12206
+msgid ""
+"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+" Gitk requires at least Tcl/Tk 8.4."
+msgstr "对不起，gitk不能运行在当前版本的Tcl/Tk中。\nGitk运行需要最低版本为Tcl/Tk8.4。"
+
+#: gitk:12416
+msgid "Cannot find a git repository here."
+msgstr "在此位置未发现git仓库。"
+
+#: gitk:12463
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "不明确有歧义的参数\"%s\"：版本和文件名称"
+
+#: gitk:12475
+msgid "Bad arguments to gitk:"
+msgstr "运行gitk参数错误："
pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack);
} else if (p->pcre2_jit_on != 0) {
BUG("The pcre2_jit_on variable should be 0 or 1, not %d",
- p->pcre1_jit_on);
+ p->pcre2_jit_on);
}
}
return p - hash_algos;
}
+/* The length in bytes and in hex digits of an object name (SHA-1 value). */
+#define GIT_SHA1_RAWSZ 20
+#define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
+/* The block size of SHA-1. */
+#define GIT_SHA1_BLKSZ 64
+
+/* The length in bytes and in hex digits of an object name (SHA-256 value). */
+#define GIT_SHA256_RAWSZ 32
+#define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
+/* The block size of SHA-256. */
+#define GIT_SHA256_BLKSZ 64
+
+/* The length in byte and in hex digits of the largest possible hash value. */
+#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
+#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
+/* The largest possible block size for any supported hash. */
+#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
+
+struct object_id {
+ unsigned char hash[GIT_MAX_RAWSZ];
+};
+
+#define the_hash_algo the_repository->hash_algo
+
#endif
#ifndef HASHMAP_H
#define HASHMAP_H
+#include "hash.h"
+
/*
* Generic implementation of hash-based key-value mappings.
*
* the results will be different on big-endian and little-endian
* platforms, so they should not be stored or transferred over the net.
*/
-static inline unsigned int sha1hash(const unsigned char *sha1)
+static inline unsigned int oidhash(const struct object_id *oid)
{
/*
- * Equivalent to 'return *(unsigned int *)sha1;', but safe on
+ * Equivalent to 'return *(unsigned int *)oid->hash;', but safe on
* platforms that don't support unaligned reads.
*/
unsigned int hash;
- memcpy(&hash, sha1, sizeof(hash));
+ memcpy(&hash, oid->hash, sizeof(hash));
return hash;
}
{
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
char *branch = strrchr(refname, '/') + 1;
- const char *remote;
/* A remote branch of the same name is deemed similar */
- if (skip_prefix(refname, "refs/remotes/", &remote) &&
+ if (starts_with(refname, "refs/remotes/") &&
!strcmp(branch, cb->base_ref))
- string_list_append(cb->similar_refs, remote);
+ string_list_append_nodup(cb->similar_refs,
+ shorten_unambiguous_ref(refname, 1));
return 0;
}
static struct string_list guess_refs(const char *ref)
{
struct similar_ref_cb ref_cb;
- struct string_list similar_refs = STRING_LIST_INIT_NODUP;
+ struct string_list similar_refs = STRING_LIST_INIT_DUP;
ref_cb.base_ref = ref;
ref_cb.similar_refs = &similar_refs;
{
struct object *obj;
- obj = lookup_object(the_repository, oid->hash);
+ obj = lookup_object(the_repository, oid);
if (!obj)
obj = parse_object(the_repository, oid);
* may be required for updating server info later.
*/
if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) {
- obj = lookup_unknown_object(ref->old_oid.hash);
+ obj = lookup_unknown_object(&ref->old_oid);
fprintf(stderr, " fetch %s for %s\n",
oid_to_hex(&ref->old_oid), refname);
add_fetch_request(obj);
#else
struct strbuf s = STRBUF_INIT;
- strbuf_addstr_urlencode(&s, proxy_auth.username, 1);
+ strbuf_addstr_urlencode(&s, proxy_auth.username,
+ is_rfc3986_unreserved);
strbuf_addch(&s, ':');
- strbuf_addstr_urlencode(&s, proxy_auth.password, 1);
+ strbuf_addstr_urlencode(&s, proxy_auth.password,
+ is_rfc3986_unreserved);
curl_proxyuserpwd = strbuf_detach(&s, NULL);
curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
#endif
git_config(urlmatch_config_entry, &config);
free(normalized_url);
+ string_list_clear(&config.vars, 1);
#if LIBCURL_VERSION_NUM >= 0x073800
if (http_ssl_backend) {
#if LIBCURL_VERSION_NUM < 0x070704
#define curl_global_cleanup() do { /* nothing */ } while (0)
#endif
+
#if LIBCURL_VERSION_NUM < 0x070800
#define curl_global_init(a) do { /* nothing */ } while (0)
+#elif LIBCURL_VERSION_NUM >= 0x070c00
+#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
+ xrealloc, xstrdup, xcalloc)
#endif
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
code; \
} }
-#define __kh_oid_cmp(a, b) (hashcmp(a, b) == 0)
-
-KHASH_INIT(sha1, const unsigned char *, void *, 1, sha1hash, __kh_oid_cmp)
-typedef kh_sha1_t khash_sha1;
-
-KHASH_INIT(sha1_pos, const unsigned char *, int, 1, sha1hash, __kh_oid_cmp)
-typedef kh_sha1_pos_t khash_sha1_pos;
-
-static inline unsigned int oid_hash(struct object_id oid)
+static inline unsigned int oidhash_by_value(struct object_id oid)
{
- return sha1hash(oid.hash);
+ return oidhash(&oid);
}
-static inline int oid_equal(struct object_id a, struct object_id b)
+static inline int oideq_by_value(struct object_id a, struct object_id b)
{
return oideq(&a, &b);
}
-KHASH_INIT(oid, struct object_id, int, 0, oid_hash, oid_equal)
+KHASH_INIT(oid_set, struct object_id, int, 0, oidhash_by_value, oideq_by_value)
-KHASH_INIT(oid_map, struct object_id, void *, 1, oid_hash, oid_equal)
-typedef kh_oid_t khash_oid_map;
+KHASH_INIT(oid_map, struct object_id, void *, 1, oidhash_by_value, oideq_by_value)
-KHASH_INIT(oid_pos, struct object_id, int, 1, oid_hash, oid_equal)
-typedef kh_oid_pos_t khash_oid_pos;
+KHASH_INIT(oid_pos, struct object_id, int, 1, oidhash_by_value, oideq_by_value)
#endif /* __AC_KHASH_H */
return (struct commit *) commit;
}
-static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
+static void fill_blob_sha1(struct repository *r, struct commit *commit,
+ struct diff_filespec *spec)
{
unsigned short mode;
struct object_id oid;
- if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))
+ if (get_tree_entry(r, &commit->object.oid, spec->path, &oid, &mode))
die("There is no path %s in the commit", spec->path);
fill_filespec(spec, &oid, 1, mode);
name_part);
spec = alloc_filespec(full_name);
- fill_blob_sha1(commit, spec);
+ fill_blob_sha1(r, commit, spec);
fill_line_ends(r, spec, &lines, &ends);
cb_data.spec = spec;
cb_data.lines = lines;
return ret;
}
+static int same_paths_in_pathspec_and_range(struct pathspec *pathspec,
+ struct line_log_data *range)
+{
+ int i;
+ struct line_log_data *r;
+
+ for (i = 0, r = range; i < pathspec->nr && r; i++, r = r->next)
+ if (strcmp(pathspec->items[i].match, r->path))
+ return 0;
+ if (i < pathspec->nr || r)
+ /* different number of pathspec items and ranges */
+ return 0;
+
+ return 1;
+}
+
+static void parse_pathspec_from_ranges(struct pathspec *pathspec,
+ struct line_log_data *range)
+{
+ struct line_log_data *r;
+ struct argv_array array = ARGV_ARRAY_INIT;
+ const char **paths;
+
+ for (r = range; r; r = r->next)
+ argv_array_push(&array, r->path);
+ paths = argv_array_detach(&array);
+
+ parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
+ /* strings are now owned by pathspec */
+ free(paths);
+}
+
void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
{
struct commit *commit = NULL;
range = parse_lines(rev->diffopt.repo, commit, prefix, args);
add_line_range(rev, commit, range);
- if (!rev->diffopt.detect_rename) {
- struct line_log_data *r;
- struct argv_array array = ARGV_ARRAY_INIT;
- const char **paths;
-
- for (r = range; r; r = r->next)
- argv_array_push(&array, r->path);
- paths = argv_array_detach(&array);
-
- parse_pathspec(&rev->diffopt.pathspec, 0,
- PATHSPEC_PREFER_FULL, "", paths);
- /* strings are now owned by pathspec */
- free(paths);
- }
+ parse_pathspec_from_ranges(&rev->diffopt.pathspec, range);
}
static void move_diff_queue(struct diff_queue_struct *dst,
struct diff_queue_struct *queue,
struct commit *commit, struct commit *parent)
{
+ struct object_id *tree_oid, *parent_tree_oid;
+
assert(commit);
+ tree_oid = get_commit_tree_oid(commit);
+ parent_tree_oid = parent ? get_commit_tree_oid(parent) : NULL;
+
+ if (opt->detect_rename &&
+ !same_paths_in_pathspec_and_range(&opt->pathspec, range)) {
+ clear_pathspec(&opt->pathspec);
+ parse_pathspec_from_ranges(&opt->pathspec, range);
+ }
DIFF_QUEUE_CLEAR(&diff_queued_diff);
- diff_tree_oid(parent ? get_commit_tree_oid(parent) : NULL,
- get_commit_tree_oid(commit), "", opt);
- if (opt->detect_rename) {
+ diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+ if (opt->detect_rename && diff_might_be_rename()) {
+ /* must look at the full tree diff to detect renames */
+ clear_pathspec(&opt->pathspec);
+ DIFF_QUEUE_CLEAR(&diff_queued_diff);
+
+ diff_tree_oid(parent_tree_oid, tree_oid, "", opt);
+
filter_diffs_for_paths(range, 1);
- if (diff_might_be_rename())
- diffcore_std(opt);
+ diffcore_std(opt);
filter_diffs_for_paths(range, 0);
}
move_diff_queue(queue, &diff_queued_diff);
#include "list-objects.h"
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
+#include "promisor-remote.h"
+#include "trace.h"
+#include "url.h"
+
+static int parse_combine_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg,
+ struct strbuf *errbuf);
/*
* Parse value of the argument to the "filter" keyword.
{
const char *v0;
- if (filter_options->choice) {
- if (errbuf) {
- strbuf_addstr(
- errbuf,
- _("multiple filter-specs cannot be combined"));
- }
- return 1;
- }
+ if (!arg)
+ return 0;
- filter_options->filter_spec = strdup(arg);
+ if (filter_options->choice)
+ BUG("filter_options already populated");
if (!strcmp(arg, "blob:none")) {
filter_options->choice = LOFC_BLOB_NONE;
} else if (skip_prefix(arg, "tree:", &v0)) {
if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) {
- if (errbuf) {
- strbuf_addstr(
- errbuf,
- _("expected 'tree:<depth>'"));
- }
+ strbuf_addstr(errbuf, _("expected 'tree:<depth>'"));
return 1;
}
filter_options->choice = LOFC_TREE_DEPTH;
_("sparse:path filters support has been dropped"));
}
return 1;
+
+ } else if (skip_prefix(arg, "combine:", &v0)) {
+ return parse_combine_filter(filter_options, v0, errbuf);
+
}
/*
* Please update _git_fetch() in git-completion.bash when you
* add new filters
*/
- if (errbuf)
- strbuf_addf(errbuf, "invalid filter-spec '%s'", arg);
+ strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg);
memset(filter_options, 0, sizeof(*filter_options));
return 1;
}
-int parse_list_objects_filter(struct list_objects_filter_options *filter_options,
- const char *arg)
+static const char *RESERVED_NON_WS = "~`!@#$^&*()[]{}\\;'\",<>?";
+
+static int has_reserved_character(
+ struct strbuf *sub_spec, struct strbuf *errbuf)
{
- struct strbuf buf = STRBUF_INIT;
- if (gently_parse_list_objects_filter(filter_options, arg, &buf))
- die("%s", buf.buf);
+ const char *c = sub_spec->buf;
+ while (*c) {
+ if (*c <= ' ' || strchr(RESERVED_NON_WS, *c)) {
+ strbuf_addf(
+ errbuf,
+ _("must escape char in sub-filter-spec: '%c'"),
+ *c);
+ return 1;
+ }
+ c++;
+ }
+
return 0;
}
+static int parse_combine_subfilter(
+ struct list_objects_filter_options *filter_options,
+ struct strbuf *subspec,
+ struct strbuf *errbuf)
+{
+ size_t new_index = filter_options->sub_nr;
+ char *decoded;
+ int result;
+
+ ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+ filter_options->sub_alloc);
+
+ decoded = url_percent_decode(subspec->buf);
+
+ result = has_reserved_character(subspec, errbuf) ||
+ gently_parse_list_objects_filter(
+ &filter_options->sub[new_index], decoded, errbuf);
+
+ free(decoded);
+ return result;
+}
+
+static int parse_combine_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg,
+ struct strbuf *errbuf)
+{
+ struct strbuf **subspecs = strbuf_split_str(arg, '+', 0);
+ size_t sub;
+ int result = 0;
+
+ if (!subspecs[0]) {
+ strbuf_addstr(errbuf, _("expected something after combine:"));
+ result = 1;
+ goto cleanup;
+ }
+
+ for (sub = 0; subspecs[sub] && !result; sub++) {
+ if (subspecs[sub + 1]) {
+ /*
+ * This is not the last subspec. Remove trailing "+" so
+ * we can parse it.
+ */
+ size_t last = subspecs[sub]->len - 1;
+ assert(subspecs[sub]->buf[last] == '+');
+ strbuf_remove(subspecs[sub], last, 1);
+ }
+ result = parse_combine_subfilter(
+ filter_options, subspecs[sub], errbuf);
+ }
+
+ filter_options->choice = LOFC_COMBINE;
+
+cleanup:
+ strbuf_list_free(subspecs);
+ if (result) {
+ list_objects_filter_release(filter_options);
+ memset(filter_options, 0, sizeof(*filter_options));
+ }
+ return result;
+}
+
+static int allow_unencoded(char ch)
+{
+ if (ch <= ' ' || ch == '%' || ch == '+')
+ return 0;
+ return !strchr(RESERVED_NON_WS, ch);
+}
+
+static void filter_spec_append_urlencode(
+ struct list_objects_filter_options *filter, const char *raw)
+{
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addstr_urlencode(&buf, raw, allow_unencoded);
+ trace_printf("Add to combine filter-spec: %s\n", buf.buf);
+ string_list_append(&filter->filter_spec, strbuf_detach(&buf, NULL));
+}
+
+/*
+ * Changes filter_options into an equivalent LOFC_COMBINE filter options
+ * instance. Does not do anything if filter_options is already LOFC_COMBINE.
+ */
+static void transform_to_combine_type(
+ struct list_objects_filter_options *filter_options)
+{
+ assert(filter_options->choice);
+ if (filter_options->choice == LOFC_COMBINE)
+ return;
+ {
+ const int initial_sub_alloc = 2;
+ struct list_objects_filter_options *sub_array =
+ xcalloc(initial_sub_alloc, sizeof(*sub_array));
+ sub_array[0] = *filter_options;
+ memset(filter_options, 0, sizeof(*filter_options));
+ filter_options->sub = sub_array;
+ filter_options->sub_alloc = initial_sub_alloc;
+ }
+ filter_options->sub_nr = 1;
+ filter_options->choice = LOFC_COMBINE;
+ string_list_append(&filter_options->filter_spec, xstrdup("combine:"));
+ filter_spec_append_urlencode(
+ filter_options,
+ list_objects_filter_spec(&filter_options->sub[0]));
+ /*
+ * We don't need the filter_spec strings for subfilter specs, only the
+ * top level.
+ */
+ string_list_clear(&filter_options->sub[0].filter_spec, /*free_util=*/0);
+}
+
+void list_objects_filter_die_if_populated(
+ struct list_objects_filter_options *filter_options)
+{
+ if (filter_options->choice)
+ die(_("multiple filter-specs cannot be combined"));
+}
+
+void parse_list_objects_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg)
+{
+ struct strbuf errbuf = STRBUF_INIT;
+ int parse_error;
+
+ if (!filter_options->choice) {
+ string_list_append(&filter_options->filter_spec, xstrdup(arg));
+
+ parse_error = gently_parse_list_objects_filter(
+ filter_options, arg, &errbuf);
+ } else {
+ /*
+ * Make filter_options an LOFC_COMBINE spec so we can trivially
+ * add subspecs to it.
+ */
+ transform_to_combine_type(filter_options);
+
+ string_list_append(&filter_options->filter_spec, xstrdup("+"));
+ filter_spec_append_urlencode(filter_options, arg);
+ ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
+ filter_options->sub_alloc);
+
+ parse_error = gently_parse_list_objects_filter(
+ &filter_options->sub[filter_options->sub_nr - 1], arg,
+ &errbuf);
+ }
+ if (parse_error)
+ die("%s", errbuf.buf);
+}
+
int opt_parse_list_objects_filter(const struct option *opt,
const char *arg, int unset)
{
struct list_objects_filter_options *filter_options = opt->value;
- if (unset || !arg) {
+ if (unset || !arg)
list_objects_filter_set_no_filter(filter_options);
- return 0;
+ else
+ parse_list_objects_filter(filter_options, arg);
+ return 0;
+}
+
+const char *list_objects_filter_spec(struct list_objects_filter_options *filter)
+{
+ if (!filter->filter_spec.nr)
+ BUG("no filter_spec available for this filter");
+ if (filter->filter_spec.nr != 1) {
+ struct strbuf concatted = STRBUF_INIT;
+ strbuf_add_separated_string_list(
+ &concatted, "", &filter->filter_spec);
+ string_list_clear(&filter->filter_spec, /*free_util=*/0);
+ string_list_append(
+ &filter->filter_spec, strbuf_detach(&concatted, NULL));
}
- return parse_list_objects_filter(filter_options, arg);
+ return filter->filter_spec.items[0].string;
}
-void expand_list_objects_filter_spec(
- const struct list_objects_filter_options *filter,
- struct strbuf *expanded_spec)
+const char *expand_list_objects_filter_spec(
+ struct list_objects_filter_options *filter)
{
- strbuf_init(expanded_spec, strlen(filter->filter_spec));
- if (filter->choice == LOFC_BLOB_LIMIT)
- strbuf_addf(expanded_spec, "blob:limit=%lu",
+ if (filter->choice == LOFC_BLOB_LIMIT) {
+ struct strbuf expanded_spec = STRBUF_INIT;
+ strbuf_addf(&expanded_spec, "blob:limit=%lu",
filter->blob_limit_value);
- else if (filter->choice == LOFC_TREE_DEPTH)
- strbuf_addf(expanded_spec, "tree:%lu",
- filter->tree_exclude_depth);
- else
- strbuf_addstr(expanded_spec, filter->filter_spec);
+ string_list_clear(&filter->filter_spec, /*free_util=*/0);
+ string_list_append(
+ &filter->filter_spec,
+ strbuf_detach(&expanded_spec, NULL));
+ }
+
+ return list_objects_filter_spec(filter);
}
void list_objects_filter_release(
struct list_objects_filter_options *filter_options)
{
- free(filter_options->filter_spec);
+ size_t sub;
+
+ if (!filter_options)
+ return;
+ string_list_clear(&filter_options->filter_spec, /*free_util=*/0);
free(filter_options->sparse_oid_value);
+ for (sub = 0; sub < filter_options->sub_nr; sub++)
+ list_objects_filter_release(&filter_options->sub[sub]);
+ free(filter_options->sub);
memset(filter_options, 0, sizeof(*filter_options));
}
void partial_clone_register(
const char *remote,
- const struct list_objects_filter_options *filter_options)
+ struct list_objects_filter_options *filter_options)
{
- /*
- * Record the name of the partial clone remote in the
- * config and in the global variable -- the latter is
- * used throughout to indicate that partial clone is
- * enabled and to expect missing objects.
- */
- if (repository_format_partial_clone &&
- *repository_format_partial_clone &&
- strcmp(remote, repository_format_partial_clone))
- die(_("cannot change partial clone promisor remote"));
+ char *cfg_name;
+ char *filter_name;
- git_config_set("core.repositoryformatversion", "1");
- git_config_set("extensions.partialclone", remote);
+ /* Check if it is already registered */
+ if (!promisor_remote_find(remote)) {
+ git_config_set("core.repositoryformatversion", "1");
- repository_format_partial_clone = xstrdup(remote);
+ /* Add promisor config for the remote */
+ cfg_name = xstrfmt("remote.%s.promisor", remote);
+ git_config_set(cfg_name, "true");
+ free(cfg_name);
+ }
/*
* Record the initial filter-spec in the config as
* the default for subsequent fetches from this remote.
*/
- core_partial_clone_filter_default =
- xstrdup(filter_options->filter_spec);
- git_config_set("core.partialclonefilter",
- core_partial_clone_filter_default);
+ filter_name = xstrfmt("remote.%s.partialclonefilter", remote);
+ /* NEEDSWORK: 'expand' result leaking??? */
+ git_config_set(filter_name,
+ expand_list_objects_filter_spec(filter_options));
+ free(filter_name);
+
+ /* Make sure the config info are reset */
+ promisor_remote_reinit();
}
void partial_clone_get_default_filter_spec(
- struct list_objects_filter_options *filter_options)
+ struct list_objects_filter_options *filter_options,
+ const char *remote)
{
+ struct promisor_remote *promisor = promisor_remote_find(remote);
+ struct strbuf errbuf = STRBUF_INIT;
+
/*
* Parse default value, but silently ignore it if it is invalid.
*/
- if (!core_partial_clone_filter_default)
+ if (!promisor)
return;
+
+ string_list_append(&filter_options->filter_spec,
+ promisor->partial_clone_filter);
gently_parse_list_objects_filter(filter_options,
- core_partial_clone_filter_default,
- NULL);
+ promisor->partial_clone_filter,
+ &errbuf);
+ strbuf_release(&errbuf);
}
#define LIST_OBJECTS_FILTER_OPTIONS_H
#include "parse-options.h"
-#include "strbuf.h"
+#include "string-list.h"
/*
* The list of defined filters for list-objects.
LOFC_BLOB_LIMIT,
LOFC_TREE_DEPTH,
LOFC_SPARSE_OID,
+ LOFC_COMBINE,
LOFC__COUNT /* must be last */
};
* commands that launch filtering sub-processes, or for communication
* over the network, don't use this value; use the result of
* expand_list_objects_filter_spec() instead.
+ * To get the raw filter spec given by the user, use the result of
+ * list_objects_filter_spec().
*/
- char *filter_spec;
+ struct string_list filter_spec;
/*
* 'choice' is determined by parsing the filter-spec. This indicates
unsigned int no_filter : 1;
/*
- * Parsed values (fields) from within the filter-spec. These are
- * choice-specific; not all values will be defined for any given
- * choice.
+ * BEGIN choice-specific parsed values from within the filter-spec. Only
+ * some values will be defined for any given choice.
*/
+
struct object_id *sparse_oid_value;
unsigned long blob_limit_value;
unsigned long tree_exclude_depth;
+
+ /* LOFC_COMBINE values */
+
+ /* This array contains all the subfilters which this filter combines. */
+ size_t sub_nr, sub_alloc;
+ struct list_objects_filter_options *sub;
+
+ /*
+ * END choice-specific parsed values.
+ */
};
/* Normalized command line arguments */
#define CL_ARG__FILTER "filter"
-int parse_list_objects_filter(
+void list_objects_filter_die_if_populated(
+ struct list_objects_filter_options *filter_options);
+
+/*
+ * Parses the filter spec string given by arg and either (1) simply places the
+ * result in filter_options if it is not yet populated or (2) combines it with
+ * the filter already in filter_options if it is already populated. In the case
+ * of (2), the filter specs are combined as if specified with 'combine:'.
+ *
+ * Dies and prints a user-facing message if an error occurs.
+ */
+void parse_list_objects_filter(
struct list_objects_filter_options *filter_options,
const char *arg);
/*
* Translates abbreviated numbers in the filter's filter_spec into their
* fully-expanded forms (e.g., "limit:blob=1k" becomes "limit:blob=1024").
+ * Returns a string owned by the list_objects_filter_options object.
*
- * This form should be used instead of the raw filter_spec field when
- * communicating with a remote process or subprocess.
+ * This form should be used instead of the raw list_objects_filter_spec()
+ * value when communicating with a remote process or subprocess.
+ */
+const char *expand_list_objects_filter_spec(
+ struct list_objects_filter_options *filter);
+
+/*
+ * Returns the filter spec string more or less in the form as the user
+ * entered it. This form of the filter_spec can be used in user-facing
+ * messages. Returns a string owned by the list_objects_filter_options
+ * object.
*/
-void expand_list_objects_filter_spec(
- const struct list_objects_filter_options *filter,
- struct strbuf *expanded_spec);
+const char *list_objects_filter_spec(
+ struct list_objects_filter_options *filter);
void list_objects_filter_release(
struct list_objects_filter_options *filter_options);
void partial_clone_register(
const char *remote,
- const struct list_objects_filter_options *filter_options);
-void partial_clone_get_default_filter_spec(
struct list_objects_filter_options *filter_options);
+void partial_clone_get_default_filter_spec(
+ struct list_objects_filter_options *filter_options,
+ const char *remote);
#endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
*/
#define FILTER_SHOWN_BUT_REVISIT (1<<21)
-/*
- * A filter for list-objects to omit ALL blobs from the traversal.
- * And to OPTIONALLY collect a list of the omitted OIDs.
- */
-struct filter_blobs_none_data {
+struct subfilter {
+ struct filter *filter;
+ struct oidset seen;
+ struct oidset omits;
+ struct object_id skip_tree;
+ unsigned is_skipping_tree : 1;
+};
+
+struct filter {
+ enum list_objects_filter_result (*filter_object_fn)(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct oidset *omits,
+ void *filter_data);
+
+ /*
+ * Optional. If this function is supplied and the filter needs
+ * to collect omits, then this function is called once before
+ * free_fn is called.
+ *
+ * This is required because the following two conditions hold:
+ *
+ * a. A tree filter can add and remove objects as an object
+ * graph is traversed.
+ * b. A combine filter's omit set is the union of all its
+ * subfilters, which may include tree: filters.
+ *
+ * As such, the omits sets must be separate sets, and can only
+ * be unioned after the traversal is completed.
+ */
+ void (*finalize_omits_fn)(struct oidset *omits, void *filter_data);
+
+ void (*free_fn)(void *filter_data);
+
+ void *filter_data;
+
+ /* If non-NULL, the filter collects a list of the omitted OIDs here. */
struct oidset *omits;
};
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
- struct filter_blobs_none_data *filter_data = filter_data_;
-
switch (filter_situation) {
default:
BUG("unknown filter_situation: %d", filter_situation);
assert(obj->type == OBJ_BLOB);
assert((obj->flags & SEEN) == 0);
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
}
}
-static void *filter_blobs_none__init(
- struct oidset *omitted,
+static void filter_blobs_none__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
- struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
-
- *filter_fn = filter_blobs_none;
- *filter_free_fn = free;
- return d;
+ filter->filter_object_fn = filter_blobs_none;
+ filter->free_fn = free;
}
/*
* Can OPTIONALLY collect a list of the omitted OIDs.
*/
struct filter_trees_depth_data {
- struct oidset *omits;
-
/*
* Maps trees to the minimum depth at which they were seen. It is not
* necessary to re-traverse a tree at deeper or equal depths than it has
/* Returns 1 if the oid was in the omits set before it was invoked. */
static int filter_trees_update_omits(
struct object *obj,
- struct filter_trees_depth_data *filter_data,
+ struct oidset *omits,
int include_it)
{
- if (!filter_data->omits)
+ if (!omits)
return 0;
if (include_it)
- return oidset_remove(filter_data->omits, &obj->oid);
+ return oidset_remove(omits, &obj->oid);
else
- return oidset_insert(filter_data->omits, &obj->oid);
+ return oidset_insert(omits, &obj->oid);
}
static enum list_objects_filter_result filter_trees_depth(
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_trees_depth_data *filter_data = filter_data_;
return LOFR_ZERO;
case LOFS_BLOB:
- filter_trees_update_omits(obj, filter_data, include_it);
+ filter_trees_update_omits(obj, omits, include_it);
return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO;
case LOFS_BEGIN_TREE:
filter_res = LOFR_SKIP_TREE;
} else {
int been_omitted = filter_trees_update_omits(
- obj, filter_data, include_it);
+ obj, omits, include_it);
seen_info->depth = filter_data->current_depth;
if (include_it)
filter_res = LOFR_DO_SHOW;
- else if (filter_data->omits && !been_omitted)
+ else if (omits && !been_omitted)
/*
* Must update omit information of children
* recursively; they have not been omitted yet.
free(d);
}
-static void *filter_trees_depth__init(
- struct oidset *omitted,
+static void filter_trees_depth__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_trees_depth_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
oidmap_init(&d->seen_at_depth, 0);
d->exclude_depth = filter_options->tree_exclude_depth;
d->current_depth = 0;
- *filter_fn = filter_trees_depth;
- *filter_free_fn = filter_trees_free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_trees_depth;
+ filter->free_fn = filter_trees_free;
}
/*
* And to OPTIONALLY collect a list of the omitted OIDs.
*/
struct filter_blobs_limit_data {
- struct oidset *omits;
unsigned long max_bytes;
};
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_blobs_limit_data *filter_data = filter_data_;
if (object_length < filter_data->max_bytes)
goto include_it;
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
}
include_it:
- if (filter_data->omits)
- oidset_remove(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_remove(omits, &obj->oid);
return LOFR_MARK_SEEN | LOFR_DO_SHOW;
}
-static void *filter_blobs_limit__init(
- struct oidset *omitted,
+static void filter_blobs_limit__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
d->max_bytes = filter_options->blob_limit_value;
- *filter_fn = filter_blobs_limit;
- *filter_free_fn = free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_blobs_limit;
+ filter->free_fn = free;
}
/*
};
struct filter_sparse_data {
- struct oidset *omits;
struct exclude_list el;
size_t nr, alloc;
struct object *obj,
const char *pathname,
const char *filename,
+ struct oidset *omits,
void *filter_data_)
{
struct filter_sparse_data *filter_data = filter_data_;
if (val < 0)
val = frame->defval;
if (val > 0) {
- if (filter_data->omits)
- oidset_remove(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_remove(omits, &obj->oid);
return LOFR_MARK_SEEN | LOFR_DO_SHOW;
}
* Leave the LOFR_ bits unset so that if the blob appears
* again in the traversal, we will be asked again.
*/
- if (filter_data->omits)
- oidset_insert(filter_data->omits, &obj->oid);
+ if (omits)
+ oidset_insert(omits, &obj->oid);
/*
* Remember that at least 1 blob in this tree was
free(d);
}
-static void *filter_sparse_oid__init(
- struct oidset *omitted,
+static void filter_sparse_oid__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct filter *filter)
{
struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
- d->omits = omitted;
if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value,
NULL, 0, &d->el) < 0)
die("could not load filter specification");
d->array_frame[d->nr].child_prov_omit = 0;
d->nr++;
- *filter_fn = filter_sparse;
- *filter_free_fn = filter_sparse_free;
- return d;
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_sparse;
+ filter->free_fn = filter_sparse_free;
}
-typedef void *(*filter_init_fn)(
- struct oidset *omitted,
+/* A filter which only shows objects shown by all sub-filters. */
+struct combine_filter_data {
+ struct subfilter *sub;
+ size_t nr;
+};
+
+static enum list_objects_filter_result process_subfilter(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct subfilter *sub)
+{
+ enum list_objects_filter_result result;
+
+ /*
+ * Check and update is_skipping_tree before oidset_contains so
+ * that is_skipping_tree gets unset even when the object is
+ * marked as seen. As of this writing, no filter uses
+ * LOFR_MARK_SEEN on trees that also uses LOFR_SKIP_TREE, so the
+ * ordering is only theoretically important. Be cautious if you
+ * change the order of the below checks and more filters have
+ * been added!
+ */
+ if (sub->is_skipping_tree) {
+ if (filter_situation == LOFS_END_TREE &&
+ oideq(&obj->oid, &sub->skip_tree))
+ sub->is_skipping_tree = 0;
+ else
+ return LOFR_ZERO;
+ }
+ if (oidset_contains(&sub->seen, &obj->oid))
+ return LOFR_ZERO;
+
+ result = list_objects_filter__filter_object(
+ r, filter_situation, obj, pathname, filename, sub->filter);
+
+ if (result & LOFR_MARK_SEEN)
+ oidset_insert(&sub->seen, &obj->oid);
+
+ if (result & LOFR_SKIP_TREE) {
+ sub->is_skipping_tree = 1;
+ sub->skip_tree = obj->oid;
+ }
+
+ return result;
+}
+
+static enum list_objects_filter_result filter_combine(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct oidset *omits,
+ void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ enum list_objects_filter_result combined_result =
+ LOFR_DO_SHOW | LOFR_MARK_SEEN | LOFR_SKIP_TREE;
+ size_t sub;
+
+ for (sub = 0; sub < d->nr; sub++) {
+ enum list_objects_filter_result sub_result = process_subfilter(
+ r, filter_situation, obj, pathname, filename,
+ &d->sub[sub]);
+ if (!(sub_result & LOFR_DO_SHOW))
+ combined_result &= ~LOFR_DO_SHOW;
+ if (!(sub_result & LOFR_MARK_SEEN))
+ combined_result &= ~LOFR_MARK_SEEN;
+ if (!d->sub[sub].is_skipping_tree)
+ combined_result &= ~LOFR_SKIP_TREE;
+ }
+
+ return combined_result;
+}
+
+static void filter_combine__free(void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ size_t sub;
+ for (sub = 0; sub < d->nr; sub++) {
+ list_objects_filter__free(d->sub[sub].filter);
+ oidset_clear(&d->sub[sub].seen);
+ if (d->sub[sub].omits.set.size)
+ BUG("expected oidset to be cleared already");
+ }
+ free(d->sub);
+}
+
+static void add_all(struct oidset *dest, struct oidset *src) {
+ struct oidset_iter iter;
+ struct object_id *src_oid;
+
+ oidset_iter_init(src, &iter);
+ while ((src_oid = oidset_iter_next(&iter)) != NULL)
+ oidset_insert(dest, src_oid);
+}
+
+static void filter_combine__finalize_omits(
+ struct oidset *omits,
+ void *filter_data)
+{
+ struct combine_filter_data *d = filter_data;
+ size_t sub;
+
+ for (sub = 0; sub < d->nr; sub++) {
+ add_all(omits, &d->sub[sub].omits);
+ oidset_clear(&d->sub[sub].omits);
+ }
+}
+
+static void filter_combine__init(
struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn);
+ struct filter* filter)
+{
+ struct combine_filter_data *d = xcalloc(1, sizeof(*d));
+ size_t sub;
+
+ d->nr = filter_options->sub_nr;
+ d->sub = xcalloc(d->nr, sizeof(*d->sub));
+ for (sub = 0; sub < d->nr; sub++)
+ d->sub[sub].filter = list_objects_filter__init(
+ filter->omits ? &d->sub[sub].omits : NULL,
+ &filter_options->sub[sub]);
+
+ filter->filter_data = d;
+ filter->filter_object_fn = filter_combine;
+ filter->free_fn = filter_combine__free;
+ filter->finalize_omits_fn = filter_combine__finalize_omits;
+}
+
+typedef void (*filter_init_fn)(
+ struct list_objects_filter_options *filter_options,
+ struct filter *filter);
/*
* Must match "enum list_objects_filter_choice".
filter_blobs_limit__init,
filter_trees_depth__init,
filter_sparse_oid__init,
+ filter_combine__init,
};
-void *list_objects_filter__init(
+struct filter *list_objects_filter__init(
struct oidset *omitted,
- struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn)
+ struct list_objects_filter_options *filter_options)
{
+ struct filter *filter;
filter_init_fn init_fn;
assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT);
filter_options->choice);
init_fn = s_filters[filter_options->choice];
- if (init_fn)
- return init_fn(omitted, filter_options,
- filter_fn, filter_free_fn);
- *filter_fn = NULL;
- *filter_free_fn = NULL;
- return NULL;
+ if (!init_fn)
+ return NULL;
+
+ filter = xcalloc(1, sizeof(*filter));
+ filter->omits = omitted;
+ init_fn(filter_options, filter);
+ return filter;
+}
+
+enum list_objects_filter_result list_objects_filter__filter_object(
+ struct repository *r,
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ struct filter *filter)
+{
+ if (filter && (obj->flags & NOT_USER_GIVEN))
+ return filter->filter_object_fn(r, filter_situation, obj,
+ pathname, filename,
+ filter->omits,
+ filter->filter_data);
+ /*
+ * No filter is active or user gave object explicitly. In this case,
+ * always show the object (except when LOFS_END_TREE, since this tree
+ * had already been shown when LOFS_BEGIN_TREE).
+ */
+ if (filter_situation == LOFS_END_TREE)
+ return 0;
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+}
+
+void list_objects_filter__free(struct filter *filter)
+{
+ if (!filter)
+ return;
+ if (filter->finalize_omits_fn && filter->omits)
+ filter->finalize_omits_fn(filter->omits, filter->filter_data);
+ filter->free_fn(filter->filter_data);
+ free(filter);
}
LOFS_BLOB
};
-typedef enum list_objects_filter_result (*filter_object_fn)(
+struct filter;
+
+/*
+ * Constructor for the set of defined list-objects filters.
+ * The `omitted` set is optional. It is populated with objects that the
+ * filter excludes. This set should not be considered finalized until
+ * after list_objects_filter__free is called on the returned `struct
+ * filter *`.
+ */
+struct filter *list_objects_filter__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options);
+
+/*
+ * Lets `filter` decide how to handle the `obj`. If `filter` is NULL, this
+ * function behaves as expected if no filter is configured: all objects are
+ * included.
+ */
+enum list_objects_filter_result list_objects_filter__filter_object(
struct repository *r,
enum list_objects_filter_situation filter_situation,
struct object *obj,
const char *pathname,
const char *filename,
- void *filter_data);
-
-typedef void (*filter_free_fn)(void *filter_data);
+ struct filter *filter);
/*
- * Constructor for the set of defined list-objects filters.
- * Returns a generic "void *filter_data".
- *
- * The returned "filter_fn" will be used by traverse_commit_list()
- * to filter the results.
- *
- * The returned "filter_free_fn" is a destructor for the
- * filter_data.
+ * Destroys `filter` and finalizes the `omitted` set, if present. Does
+ * nothing if `filter` is null.
*/
-void *list_objects_filter__init(
- struct oidset *omitted,
- struct list_objects_filter_options *filter_options,
- filter_object_fn *filter_fn,
- filter_free_fn *filter_free_fn);
+void list_objects_filter__free(struct filter *filter);
#endif /* LIST_OBJECTS_FILTER_H */
show_object_fn show_object;
show_commit_fn show_commit;
void *show_data;
- filter_object_fn filter_fn;
- void *filter_data;
+ struct filter *filter;
};
static void process_blob(struct traversal_context *ctx,
{
struct object *obj = &blob->object;
size_t pathlen;
- enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+ enum list_objects_filter_result r;
if (!ctx->revs->blob_objects)
return;
pathlen = path->len;
strbuf_addstr(path, name);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_BLOB, obj,
- path->buf, &path->buf[pathlen],
- ctx->filter_data);
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_BLOB, obj,
+ path->buf, &path->buf[pathlen],
+ ctx->filter);
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
struct object *obj = &tree->object;
struct rev_info *revs = ctx->revs;
int baselen = base->len;
- enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
+ enum list_objects_filter_result r;
int failed_parse;
if (!revs->tree_objects)
}
strbuf_addstr(base, name);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn)
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_BEGIN_TREE, obj,
- base->buf, &base->buf[baselen],
- ctx->filter_data);
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_BEGIN_TREE, obj,
+ base->buf, &base->buf[baselen],
+ ctx->filter);
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
else if (!failed_parse)
process_tree_contents(ctx, tree, base);
- if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) {
- r = ctx->filter_fn(ctx->revs->repo,
- LOFS_END_TREE, obj,
- base->buf, &base->buf[baselen],
- ctx->filter_data);
- if (r & LOFR_MARK_SEEN)
- obj->flags |= SEEN;
- if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data);
- }
+ r = list_objects_filter__filter_object(ctx->revs->repo,
+ LOFS_END_TREE, obj,
+ base->buf, &base->buf[baselen],
+ ctx->filter);
+ if (r & LOFR_MARK_SEEN)
+ obj->flags |= SEEN;
+ if (r & LOFR_DO_SHOW)
+ ctx->show_object(obj, base->buf, ctx->show_data);
strbuf_setlen(base, baselen);
free_tree_buffer(tree);
ctx.show_commit = show_commit;
ctx.show_object = show_object;
ctx.show_data = show_data;
- ctx.filter_fn = NULL;
- ctx.filter_data = NULL;
+ ctx.filter = NULL;
do_traverse(&ctx);
}
struct oidset *omitted)
{
struct traversal_context ctx;
- filter_free_fn filter_free_fn = NULL;
ctx.revs = revs;
ctx.show_object = show_object;
ctx.show_commit = show_commit;
ctx.show_data = show_data;
- ctx.filter_fn = NULL;
-
- ctx.filter_data = list_objects_filter__init(omitted, filter_options,
- &ctx.filter_fn, &filter_free_fn);
+ ctx.filter = list_objects_filter__init(omitted, filter_options);
do_traverse(&ctx);
- if (ctx.filter_data && filter_free_fn)
- filter_free_fn(ctx.filter_data);
+ list_objects_filter__free(ctx.filter);
}
char *cmdline;
};
+static struct attr_check *merge_attributes;
+static struct attr_check *load_merge_attributes(void)
+{
+ if (!merge_attributes)
+ merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL);
+ return merge_attributes;
+}
+
+void reset_merge_attributes(void)
+{
+ attr_check_free(merge_attributes);
+ merge_attributes = NULL;
+}
+
/*
* Built-in low-levels
*/
struct index_state *istate,
const struct ll_merge_options *opts)
{
- static struct attr_check *check;
+ struct attr_check *check = load_merge_attributes();
static const struct ll_merge_options default_opts;
const char *ll_driver_name = NULL;
int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
normalize_file(theirs, path, istate);
}
- if (!check)
- check = attr_check_initl("merge", "conflict-marker-size", NULL);
-
git_check_attr(istate, path, check);
ll_driver_name = check->items[0].value;
if (check->items[1].value) {
const struct ll_merge_options *opts);
int ll_merge_marker_size(struct index_state *istate, const char *path);
+void reset_merge_attributes(void);
#endif
raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
format_display_notes(&commit->object.oid, ¬ebuf,
get_log_output_encoding(), raw);
- ctx.notes_message = notebuf.len
- ? strbuf_detach(¬ebuf, NULL)
- : xcalloc(1, 1);
+ ctx.notes_message = strbuf_detach(¬ebuf, NULL);
}
/*
* other hand, it could cover tree one and we might need to pick a
* subtree of it.
*/
-void shift_tree(const struct object_id *hash1,
+void shift_tree(struct repository *r,
+ const struct object_id *hash1,
const struct object_id *hash2,
struct object_id *shifted,
int depth_limit)
if (!*del_prefix)
return;
- if (get_tree_entry(hash2, del_prefix, shifted, &mode))
+ if (get_tree_entry(r, hash2, del_prefix, shifted, &mode))
die("cannot find path %s in tree %s",
del_prefix, oid_to_hex(hash2));
return;
* Unfortunately we cannot fundamentally tell which one to
* be prefixed, as recursive merge can work in either direction.
*/
-void shift_tree_by(const struct object_id *hash1,
+void shift_tree_by(struct repository *r,
+ const struct object_id *hash1,
const struct object_id *hash2,
struct object_id *shifted,
const char *shift_prefix)
unsigned candidate = 0;
/* Can hash2 be a tree at shift_prefix in tree hash1? */
- if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
+ if (!get_tree_entry(r, hash1, shift_prefix, &sub1, &mode1) &&
S_ISDIR(mode1))
candidate |= 1;
/* Can hash1 be a tree at shift_prefix in tree hash2? */
- if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
+ if (!get_tree_entry(r, hash2, shift_prefix, &sub2, &mode2) &&
S_ISDIR(mode2))
candidate |= 2;
struct object_id shifted;
if (!*subtree_shift) {
- shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
+ shift_tree(repo, &one->object.oid, &two->object.oid, &shifted, 0);
} else {
- shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
+ shift_tree_by(repo, &one->object.oid, &two->object.oid, &shifted,
subtree_shift);
}
if (oideq(&two->object.oid, &shifted))
{
struct pathspec match_all;
memset(&match_all, 0, sizeof(match_all));
- read_tree_recursive(the_repository, tree, "", 0, 0,
+ read_tree_recursive(opt->repo, tree, "", 0, 0,
&match_all, save_files_dirs, opt);
}
-static int get_tree_entry_if_blob(const struct object_id *tree,
+static int get_tree_entry_if_blob(struct repository *r,
+ const struct object_id *tree,
const char *path,
struct diff_filespec *dfs)
{
int ret;
- ret = get_tree_entry(tree, path, &dfs->oid, &dfs->mode);
+ ret = get_tree_entry(r, tree, path, &dfs->oid, &dfs->mode);
if (S_ISDIR(dfs->mode)) {
oidcpy(&dfs->oid, &null_oid);
dfs->mode = 0;
* Returns an index_entry instance which doesn't have to correspond to
* a real cache entry in Git's index.
*/
-static struct stage_data *insert_stage_data(const char *path,
+static struct stage_data *insert_stage_data(struct repository *r,
+ const char *path,
struct tree *o, struct tree *a, struct tree *b,
struct string_list *entries)
{
struct string_list_item *item;
struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
- get_tree_entry_if_blob(&o->object.oid, path, &e->stages[1]);
- get_tree_entry_if_blob(&a->object.oid, path, &e->stages[2]);
- get_tree_entry_if_blob(&b->object.oid, path, &e->stages[3]);
+ get_tree_entry_if_blob(r, &o->object.oid, path, &e->stages[1]);
+ get_tree_entry_if_blob(r, &a->object.oid, path, &e->stages[2]);
+ get_tree_entry_if_blob(r, &b->object.oid, path, &e->stages[3]);
item = string_list_insert(entries, path);
item->util = e;
return e;
return ret;
}
-static int tree_has_path(struct tree *tree, const char *path)
+static int tree_has_path(struct repository *r, struct tree *tree,
+ const char *path)
{
struct object_id hashy;
unsigned short mode_o;
- return !get_tree_entry(&tree->object.oid, path,
+ return !get_tree_entry(r,
+ &tree->object.oid, path,
&hashy, &mode_o);
}
*/
if (collision_ent->reported_already) {
clean = 0;
- } else if (tree_has_path(tree, new_path)) {
+ } else if (tree_has_path(opt->repo, tree, new_path)) {
collision_ent->reported_already = 1;
strbuf_add_separated_string_list(&collision_paths, ", ",
&collision_ent->source_files);
string_list_append(&remove_from_merge,
merge_ent->dir)->util = merge_ent;
strbuf_release(&merge_ent->new_dir);
- } else if (tree_has_path(head, head_ent->dir)) {
+ } else if (tree_has_path(opt->repo, head, head_ent->dir)) {
/* 2. This wasn't a directory rename after all */
string_list_append(&remove_from_head,
head_ent->dir)->util = head_ent;
hashmap_iter_init(dir_re_merge, &iter);
while ((merge_ent = hashmap_iter_next(&iter))) {
head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
- if (tree_has_path(merge, merge_ent->dir)) {
+ if (tree_has_path(opt->repo, merge, merge_ent->dir)) {
/* 2. This wasn't a directory rename after all */
string_list_append(&remove_from_merge,
merge_ent->dir)->util = merge_ent;
if (pair->status == 'R')
re->dst_entry->processed = 1;
- re->dst_entry = insert_stage_data(new_path,
+ re->dst_entry = insert_stage_data(opt->repo, new_path,
o_tree, a_tree, b_tree,
entries);
item = string_list_insert(entries, new_path);
* the various handle_rename_*() functions update the index
* explicitly rather than relying on unpack_trees() to have done it.
*/
- get_tree_entry(&tree->object.oid,
+ get_tree_entry(opt->repo,
+ &tree->object.oid,
pair->two->path,
&re->dst_entry->stages[stage].oid,
&re->dst_entry->stages[stage].mode);
re->dir_rename_original_dest = NULL;
item = string_list_lookup(entries, re->pair->one->path);
if (!item)
- re->src_entry = insert_stage_data(re->pair->one->path,
+ re->src_entry = insert_stage_data(opt->repo,
+ re->pair->one->path,
o_tree, a_tree, b_tree, entries);
else
re->src_entry = item->util;
item = string_list_lookup(entries, re->pair->two->path);
if (!item)
- re->dst_entry = insert_stage_data(re->pair->two->path,
+ re->dst_entry = insert_stage_data(opt->repo,
+ re->pair->two->path,
o_tree, a_tree, b_tree, entries);
else
re->dst_entry = item->util;
head_pairs = get_diffpairs(opt, common, head);
merge_pairs = get_diffpairs(opt, common, merge);
- if (opt->detect_directory_renames) {
+ if ((opt->detect_directory_renames == 2) ||
+ (opt->detect_directory_renames == 1 && !opt->call_depth)) {
dir_re_head = get_directory_renames(head_pairs);
dir_re_merge = get_directory_renames(merge_pairs);
#include "midx.h"
#include "progress.h"
#include "trace2.h"
+#include "run-command.h"
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1
#define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t))
#define MIDX_LARGE_OFFSET_NEEDED 0x80000000
+#define PACK_EXPIRED UINT_MAX
+
static char *get_midx_filename(const char *object_dir)
{
return xstrfmt("%s/pack/multi-pack-index", object_dir);
return MIDX_HEADER_SIZE;
}
+struct pack_info {
+ uint32_t orig_pack_int_id;
+ char *pack_name;
+ struct packed_git *p;
+ unsigned expired : 1;
+};
+
+static int pack_info_compare(const void *_a, const void *_b)
+{
+ struct pack_info *a = (struct pack_info *)_a;
+ struct pack_info *b = (struct pack_info *)_b;
+ return strcmp(a->pack_name, b->pack_name);
+}
+
struct pack_list {
- struct packed_git **list;
- char **names;
+ struct pack_info *info;
uint32_t nr;
- uint32_t alloc_list;
- uint32_t alloc_names;
- size_t pack_name_concat_len;
+ uint32_t alloc;
struct multi_pack_index *m;
};
if (packs->m && midx_contains_pack(packs->m, file_name))
return;
- ALLOC_GROW(packs->list, packs->nr + 1, packs->alloc_list);
- ALLOC_GROW(packs->names, packs->nr + 1, packs->alloc_names);
+ ALLOC_GROW(packs->info, packs->nr + 1, packs->alloc);
- packs->list[packs->nr] = add_packed_git(full_path,
- full_path_len,
- 0);
+ packs->info[packs->nr].p = add_packed_git(full_path,
+ full_path_len,
+ 0);
- if (!packs->list[packs->nr]) {
+ if (!packs->info[packs->nr].p) {
warning(_("failed to add packfile '%s'"),
full_path);
return;
}
- if (open_pack_index(packs->list[packs->nr])) {
+ if (open_pack_index(packs->info[packs->nr].p)) {
warning(_("failed to open pack-index '%s'"),
full_path);
- close_pack(packs->list[packs->nr]);
- FREE_AND_NULL(packs->list[packs->nr]);
+ close_pack(packs->info[packs->nr].p);
+ FREE_AND_NULL(packs->info[packs->nr].p);
return;
}
- packs->names[packs->nr] = xstrdup(file_name);
- packs->pack_name_concat_len += strlen(file_name) + 1;
+ packs->info[packs->nr].pack_name = xstrdup(file_name);
+ packs->info[packs->nr].orig_pack_int_id = packs->nr;
+ packs->info[packs->nr].expired = 0;
packs->nr++;
}
}
-struct pack_pair {
- uint32_t pack_int_id;
- char *pack_name;
-};
-
-static int pack_pair_compare(const void *_a, const void *_b)
-{
- struct pack_pair *a = (struct pack_pair *)_a;
- struct pack_pair *b = (struct pack_pair *)_b;
- return strcmp(a->pack_name, b->pack_name);
-}
-
-static void sort_packs_by_name(char **pack_names, uint32_t nr_packs, uint32_t *perm)
-{
- uint32_t i;
- struct pack_pair *pairs;
-
- ALLOC_ARRAY(pairs, nr_packs);
-
- for (i = 0; i < nr_packs; i++) {
- pairs[i].pack_int_id = i;
- pairs[i].pack_name = pack_names[i];
- }
-
- QSORT(pairs, nr_packs, pack_pair_compare);
-
- for (i = 0; i < nr_packs; i++) {
- pack_names[i] = pairs[i].pack_name;
- perm[pairs[i].pack_int_id] = i;
- }
-
- free(pairs);
-}
-
struct pack_midx_entry {
struct object_id oid;
uint32_t pack_int_id;
}
static int nth_midxed_pack_midx_entry(struct multi_pack_index *m,
- uint32_t *pack_perm,
struct pack_midx_entry *e,
uint32_t pos)
{
return 1;
nth_midxed_object_oid(&e->oid, m, pos);
- e->pack_int_id = pack_perm[nth_midxed_pack_int_id(m, pos)];
+ e->pack_int_id = nth_midxed_pack_int_id(m, pos);
e->offset = nth_midxed_offset(m, pos);
/* consider objects in midx to be from "old" packs */
* of a packfile containing the object).
*/
static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
- struct packed_git **p,
- uint32_t *perm,
+ struct pack_info *info,
uint32_t nr_packs,
uint32_t *nr_objects)
{
uint32_t start_pack = m ? m->num_packs : 0;
for (cur_pack = start_pack; cur_pack < nr_packs; cur_pack++)
- total_objects += p[cur_pack]->num_objects;
+ total_objects += info[cur_pack].p->num_objects;
/*
* As we de-duplicate by fanout value, we expect the fanout
for (cur_object = start; cur_object < end; cur_object++) {
ALLOC_GROW(entries_by_fanout, nr_fanout + 1, alloc_fanout);
- nth_midxed_pack_midx_entry(m, perm,
+ nth_midxed_pack_midx_entry(m,
&entries_by_fanout[nr_fanout],
cur_object);
nr_fanout++;
uint32_t start = 0, end;
if (cur_fanout)
- start = get_pack_fanout(p[cur_pack], cur_fanout - 1);
- end = get_pack_fanout(p[cur_pack], cur_fanout);
+ start = get_pack_fanout(info[cur_pack].p, cur_fanout - 1);
+ end = get_pack_fanout(info[cur_pack].p, cur_fanout);
for (cur_object = start; cur_object < end; cur_object++) {
ALLOC_GROW(entries_by_fanout, nr_fanout + 1, alloc_fanout);
- fill_pack_entry(perm[cur_pack], p[cur_pack], cur_object, &entries_by_fanout[nr_fanout]);
+ fill_pack_entry(cur_pack, info[cur_pack].p, cur_object, &entries_by_fanout[nr_fanout]);
nr_fanout++;
}
}
}
static size_t write_midx_pack_names(struct hashfile *f,
- char **pack_names,
+ struct pack_info *info,
uint32_t num_packs)
{
uint32_t i;
size_t written = 0;
for (i = 0; i < num_packs; i++) {
- size_t writelen = strlen(pack_names[i]) + 1;
+ size_t writelen;
+
+ if (info[i].expired)
+ continue;
- if (i && strcmp(pack_names[i], pack_names[i - 1]) <= 0)
+ if (i && strcmp(info[i].pack_name, info[i - 1].pack_name) <= 0)
BUG("incorrect pack-file order: %s before %s",
- pack_names[i - 1],
- pack_names[i]);
+ info[i - 1].pack_name,
+ info[i].pack_name);
- hashwrite(f, pack_names[i], writelen);
+ writelen = strlen(info[i].pack_name) + 1;
+ hashwrite(f, info[i].pack_name, writelen);
written += writelen;
}
}
static size_t write_midx_object_offsets(struct hashfile *f, int large_offset_needed,
+ uint32_t *perm,
struct pack_midx_entry *objects, uint32_t nr_objects)
{
struct pack_midx_entry *list = objects;
for (i = 0; i < nr_objects; i++) {
struct pack_midx_entry *obj = list++;
- hashwrite_be32(f, obj->pack_int_id);
+ if (perm[obj->pack_int_id] == PACK_EXPIRED)
+ BUG("object %s is in an expired pack with int-id %d",
+ oid_to_hex(&obj->oid),
+ obj->pack_int_id);
+
+ hashwrite_be32(f, perm[obj->pack_int_id]);
if (large_offset_needed && obj->offset >> 31)
hashwrite_be32(f, MIDX_LARGE_OFFSET_NEEDED | nr_large_offset++);
return written;
}
-int write_midx_file(const char *object_dir)
+static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
+ struct string_list *packs_to_drop)
{
unsigned char cur_chunk, num_chunks = 0;
char *midx_name;
uint32_t nr_entries, num_large_offsets = 0;
struct pack_midx_entry *entries = NULL;
int large_offsets_needed = 0;
+ int pack_name_concat_len = 0;
+ int dropped_packs = 0;
+ int result = 0;
midx_name = get_midx_filename(object_dir);
if (safe_create_leading_directories(midx_name)) {
midx_name);
}
- packs.m = load_multi_pack_index(object_dir, 1);
+ if (m)
+ packs.m = m;
+ else
+ packs.m = load_multi_pack_index(object_dir, 1);
packs.nr = 0;
- packs.alloc_list = packs.m ? packs.m->num_packs : 16;
- packs.alloc_names = packs.alloc_list;
- packs.list = NULL;
- packs.names = NULL;
- packs.pack_name_concat_len = 0;
- ALLOC_ARRAY(packs.list, packs.alloc_list);
- ALLOC_ARRAY(packs.names, packs.alloc_names);
+ packs.alloc = packs.m ? packs.m->num_packs : 16;
+ packs.info = NULL;
+ ALLOC_ARRAY(packs.info, packs.alloc);
if (packs.m) {
for (i = 0; i < packs.m->num_packs; i++) {
- ALLOC_GROW(packs.list, packs.nr + 1, packs.alloc_list);
- ALLOC_GROW(packs.names, packs.nr + 1, packs.alloc_names);
+ ALLOC_GROW(packs.info, packs.nr + 1, packs.alloc);
- packs.list[packs.nr] = NULL;
- packs.names[packs.nr] = xstrdup(packs.m->pack_names[i]);
- packs.pack_name_concat_len += strlen(packs.names[packs.nr]) + 1;
+ packs.info[packs.nr].orig_pack_int_id = i;
+ packs.info[packs.nr].pack_name = xstrdup(packs.m->pack_names[i]);
+ packs.info[packs.nr].p = NULL;
+ packs.info[packs.nr].expired = 0;
packs.nr++;
}
}
for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
- if (packs.m && packs.nr == packs.m->num_packs)
+ if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
goto cleanup;
- if (packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
- packs.pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
- (packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
-
- ALLOC_ARRAY(pack_perm, packs.nr);
- sort_packs_by_name(packs.names, packs.nr, pack_perm);
-
- entries = get_sorted_entries(packs.m, packs.list, pack_perm, packs.nr, &nr_entries);
+ entries = get_sorted_entries(packs.m, packs.info, packs.nr, &nr_entries);
for (i = 0; i < nr_entries; i++) {
if (entries[i].offset > 0x7fffffff)
large_offsets_needed = 1;
}
+ QSORT(packs.info, packs.nr, pack_info_compare);
+
+ if (packs_to_drop && packs_to_drop->nr) {
+ int drop_index = 0;
+ int missing_drops = 0;
+
+ for (i = 0; i < packs.nr && drop_index < packs_to_drop->nr; i++) {
+ int cmp = strcmp(packs.info[i].pack_name,
+ packs_to_drop->items[drop_index].string);
+
+ if (!cmp) {
+ drop_index++;
+ packs.info[i].expired = 1;
+ } else if (cmp > 0) {
+ error(_("did not see pack-file %s to drop"),
+ packs_to_drop->items[drop_index].string);
+ drop_index++;
+ missing_drops++;
+ i--;
+ } else {
+ packs.info[i].expired = 0;
+ }
+ }
+
+ if (missing_drops) {
+ result = 1;
+ goto cleanup;
+ }
+ }
+
+ /*
+ * pack_perm stores a permutation between pack-int-ids from the
+ * previous multi-pack-index to the new one we are writing:
+ *
+ * pack_perm[old_id] = new_id
+ */
+ ALLOC_ARRAY(pack_perm, packs.nr);
+ for (i = 0; i < packs.nr; i++) {
+ if (packs.info[i].expired) {
+ dropped_packs++;
+ pack_perm[packs.info[i].orig_pack_int_id] = PACK_EXPIRED;
+ } else {
+ pack_perm[packs.info[i].orig_pack_int_id] = i - dropped_packs;
+ }
+ }
+
+ for (i = 0; i < packs.nr; i++) {
+ if (!packs.info[i].expired)
+ pack_name_concat_len += strlen(packs.info[i].pack_name) + 1;
+ }
+
+ if (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
+ pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
+ (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
+
hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
FREE_AND_NULL(midx_name);
cur_chunk = 0;
num_chunks = large_offsets_needed ? 5 : 4;
- written = write_midx_header(f, num_chunks, packs.nr);
+ written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
chunk_offsets[cur_chunk] = written + (num_chunks + 1) * MIDX_CHUNKLOOKUP_WIDTH;
cur_chunk++;
chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDFANOUT;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + packs.pack_name_concat_len;
+ chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + pack_name_concat_len;
cur_chunk++;
chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDLOOKUP;
switch (chunk_ids[i]) {
case MIDX_CHUNKID_PACKNAMES:
- written += write_midx_pack_names(f, packs.names, packs.nr);
+ written += write_midx_pack_names(f, packs.info, packs.nr);
break;
case MIDX_CHUNKID_OIDFANOUT:
break;
case MIDX_CHUNKID_OBJECTOFFSETS:
- written += write_midx_object_offsets(f, large_offsets_needed, entries, nr_entries);
+ written += write_midx_object_offsets(f, large_offsets_needed, pack_perm, entries, nr_entries);
break;
case MIDX_CHUNKID_LARGEOFFSETS:
cleanup:
for (i = 0; i < packs.nr; i++) {
- if (packs.list[i]) {
- close_pack(packs.list[i]);
- free(packs.list[i]);
+ if (packs.info[i].p) {
+ close_pack(packs.info[i].p);
+ free(packs.info[i].p);
}
- free(packs.names[i]);
+ free(packs.info[i].pack_name);
}
- free(packs.list);
- free(packs.names);
+ free(packs.info);
free(entries);
free(pack_perm);
free(midx_name);
- return 0;
+ return result;
+}
+
+int write_midx_file(const char *object_dir)
+{
+ return write_midx_internal(object_dir, NULL, NULL);
}
void clear_midx_file(struct repository *r)
return verify_midx_error;
}
+
+int expire_midx_packs(struct repository *r, const char *object_dir)
+{
+ uint32_t i, *count, result = 0;
+ struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
+ struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+
+ if (!m)
+ return 0;
+
+ count = xcalloc(m->num_packs, sizeof(uint32_t));
+ for (i = 0; i < m->num_objects; i++) {
+ int pack_int_id = nth_midxed_pack_int_id(m, i);
+ count[pack_int_id]++;
+ }
+
+ for (i = 0; i < m->num_packs; i++) {
+ char *pack_name;
+
+ if (count[i])
+ continue;
+
+ if (prepare_midx_pack(r, m, i))
+ continue;
+
+ if (m->packs[i]->pack_keep)
+ continue;
+
+ pack_name = xstrdup(m->packs[i]->pack_name);
+ close_pack(m->packs[i]);
+
+ string_list_insert(&packs_to_drop, m->pack_names[i]);
+ unlink_pack_path(pack_name, 0);
+ free(pack_name);
+ }
+
+ free(count);
+
+ if (packs_to_drop.nr)
+ result = write_midx_internal(object_dir, m, &packs_to_drop);
+
+ string_list_clear(&packs_to_drop, 0);
+ return result;
+}
+
+struct repack_info {
+ timestamp_t mtime;
+ uint32_t referenced_objects;
+ uint32_t pack_int_id;
+};
+
+static int compare_by_mtime(const void *a_, const void *b_)
+{
+ const struct repack_info *a, *b;
+
+ a = (const struct repack_info *)a_;
+ b = (const struct repack_info *)b_;
+
+ if (a->mtime < b->mtime)
+ return -1;
+ if (a->mtime > b->mtime)
+ return 1;
+ return 0;
+}
+
+static int fill_included_packs_all(struct multi_pack_index *m,
+ unsigned char *include_pack)
+{
+ uint32_t i;
+
+ for (i = 0; i < m->num_packs; i++)
+ include_pack[i] = 1;
+
+ return m->num_packs < 2;
+}
+
+static int fill_included_packs_batch(struct repository *r,
+ struct multi_pack_index *m,
+ unsigned char *include_pack,
+ size_t batch_size)
+{
+ uint32_t i, packs_to_repack;
+ size_t total_size;
+ struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info));
+
+ for (i = 0; i < m->num_packs; i++) {
+ pack_info[i].pack_int_id = i;
+
+ if (prepare_midx_pack(r, m, i))
+ continue;
+
+ pack_info[i].mtime = m->packs[i]->mtime;
+ }
+
+ for (i = 0; batch_size && i < m->num_objects; i++) {
+ uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
+ pack_info[pack_int_id].referenced_objects++;
+ }
+
+ QSORT(pack_info, m->num_packs, compare_by_mtime);
+
+ total_size = 0;
+ packs_to_repack = 0;
+ for (i = 0; total_size < batch_size && i < m->num_packs; i++) {
+ int pack_int_id = pack_info[i].pack_int_id;
+ struct packed_git *p = m->packs[pack_int_id];
+ size_t expected_size;
+
+ if (!p)
+ continue;
+ if (open_pack_index(p) || !p->num_objects)
+ continue;
+
+ expected_size = (size_t)(p->pack_size
+ * pack_info[i].referenced_objects);
+ expected_size /= p->num_objects;
+
+ if (expected_size >= batch_size)
+ continue;
+
+ packs_to_repack++;
+ total_size += expected_size;
+ include_pack[pack_int_id] = 1;
+ }
+
+ free(pack_info);
+
+ if (total_size < batch_size || packs_to_repack < 2)
+ return 1;
+
+ return 0;
+}
+
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
+{
+ int result = 0;
+ uint32_t i;
+ unsigned char *include_pack;
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct strbuf base_name = STRBUF_INIT;
+ struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+
+ if (!m)
+ return 0;
+
+ include_pack = xcalloc(m->num_packs, sizeof(unsigned char));
+
+ if (batch_size) {
+ if (fill_included_packs_batch(r, m, include_pack, batch_size))
+ goto cleanup;
+ } else if (fill_included_packs_all(m, include_pack))
+ goto cleanup;
+
+ argv_array_push(&cmd.args, "pack-objects");
+
+ strbuf_addstr(&base_name, object_dir);
+ strbuf_addstr(&base_name, "/pack/pack");
+ argv_array_push(&cmd.args, base_name.buf);
+ strbuf_release(&base_name);
+
+ cmd.git_cmd = 1;
+ cmd.in = cmd.out = -1;
+
+ if (start_command(&cmd)) {
+ error(_("could not start pack-objects"));
+ result = 1;
+ goto cleanup;
+ }
+
+ for (i = 0; i < m->num_objects; i++) {
+ struct object_id oid;
+ uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
+
+ if (!include_pack[pack_int_id])
+ continue;
+
+ nth_midxed_object_oid(&oid, m, i);
+ xwrite(cmd.in, oid_to_hex(&oid), the_hash_algo->hexsz);
+ xwrite(cmd.in, "\n", 1);
+ }
+ close(cmd.in);
+
+ if (finish_command(&cmd)) {
+ error(_("could not finish pack-objects"));
+ result = 1;
+ goto cleanup;
+ }
+
+ result = write_midx_internal(object_dir, m, NULL);
+ m = NULL;
+
+cleanup:
+ if (m)
+ close_midx(m);
+ free(include_pack);
+ return result;
+}
int write_midx_file(const char *object_dir);
void clear_midx_file(struct repository *r);
int verify_midx_file(struct repository *r, const char *object_dir);
+int expire_midx_packs(struct repository *r, const char *object_dir);
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size);
void close_midx(struct multi_pack_index *m);
struct name_entry entry;
const unsigned hashsz = the_hash_algo->rawsz;
- buf = fill_tree_descriptor(&desc, &subtree->val_oid);
+ buf = fill_tree_descriptor(the_repository, &desc, &subtree->val_oid);
if (!buf)
die("Could not read %s for notes-index",
oid_to_hex(&subtree->val_oid));
return;
if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
die("Cannot use notes ref %s", notes_ref);
- if (get_tree_entry(&object_oid, "", &oid, &mode))
+ if (get_tree_entry(the_repository, &object_oid, "", &oid, &mode))
die("Failed to read notes tree referenced by %s (%s)",
notes_ref, oid_to_hex(&object_oid));
char *compute_alternate_path(const char *path, struct strbuf *err);
typedef int alt_odb_fn(struct object_directory *, void *);
int foreach_alt_odb(alt_odb_fn, void*);
+typedef void alternate_ref_fn(const struct object_id *oid, void *);
+void for_each_alternate_ref(alternate_ref_fn, void *);
/*
* Add the directory to the on-disk alternates file; the new entry will also
* the specified sha1. n must be a power of 2. Please note that the
* return value is *not* consistent across computer architectures.
*/
-static unsigned int hash_obj(const unsigned char *sha1, unsigned int n)
+static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
{
- return sha1hash(sha1) & (n - 1);
+ return oidhash(oid) & (n - 1);
}
/*
*/
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
- unsigned int j = hash_obj(obj->oid.hash, size);
+ unsigned int j = hash_obj(&obj->oid, size);
while (hash[j]) {
j++;
* Look up the record for the given sha1 in the hash map stored in
* obj_hash. Return NULL if it was not found.
*/
-struct object *lookup_object(struct repository *r, const unsigned char *sha1)
+struct object *lookup_object(struct repository *r, const struct object_id *oid)
{
unsigned int i, first;
struct object *obj;
if (!r->parsed_objects->obj_hash)
return NULL;
- first = i = hash_obj(sha1, r->parsed_objects->obj_hash_size);
+ first = i = hash_obj(oid, r->parsed_objects->obj_hash_size);
while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {
- if (hasheq(sha1, obj->oid.hash))
+ if (oideq(oid, &obj->oid))
break;
i++;
if (i == r->parsed_objects->obj_hash_size)
r->parsed_objects->obj_hash_size = new_hash_size;
}
-void *create_object(struct repository *r, const unsigned char *sha1, void *o)
+void *create_object(struct repository *r, const struct object_id *oid, void *o)
{
struct object *obj = o;
obj->parsed = 0;
obj->flags = 0;
- hashcpy(obj->oid.hash, sha1);
+ oidcpy(&obj->oid, oid);
if (r->parsed_objects->obj_hash_size - 1 <= r->parsed_objects->nr_objs * 2)
grow_object_hash(r);
}
}
-struct object *lookup_unknown_object(const unsigned char *sha1)
+struct object *lookup_unknown_object(const struct object_id *oid)
{
- struct object *obj = lookup_object(the_repository, sha1);
+ struct object *obj = lookup_object(the_repository, oid);
if (!obj)
- obj = create_object(the_repository, sha1,
+ obj = create_object(the_repository, oid,
alloc_object_node(the_repository));
return obj;
}
void *buffer;
struct object *obj;
- obj = lookup_object(r, oid->hash);
+ obj = lookup_object(r, oid);
if (obj && obj->parsed)
return obj;
return NULL;
}
parse_blob_buffer(lookup_blob(r, oid), NULL, 0);
- return lookup_object(r, oid->hash);
+ return lookup_object(r, oid);
}
buffer = repo_read_object_file(r, oid, &type, &size);
* half-initialised objects, the caller is expected to initialize them
* by calling parse_object() on them.
*/
-struct object *lookup_object(struct repository *r, const unsigned char *sha1);
+struct object *lookup_object(struct repository *r, const struct object_id *oid);
-void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
+void *create_object(struct repository *r, const struct object_id *oid, void *obj);
void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
/** Returns the object, with potentially excess memory allocated. **/
-struct object *lookup_unknown_object(const unsigned char *sha1);
+struct object *lookup_unknown_object(const struct object_id *oid);
struct object_list *object_list_insert(struct object *item,
struct object_list **list_p);
&((const struct oidmap_entry *) entry_or_key)->oid);
}
-static int hash(const struct object_id *oid)
-{
- int hash;
- memcpy(&hash, oid->hash, sizeof(hash));
- return hash;
-}
-
void oidmap_init(struct oidmap *map, size_t initial_size)
{
hashmap_init(&map->map, oidmap_neq, NULL, initial_size);
if (!map->map.cmpfn)
return NULL;
- return hashmap_get_from_hash(&map->map, hash(key), key);
+ return hashmap_get_from_hash(&map->map, oidhash(key), key);
}
void *oidmap_remove(struct oidmap *map, const struct object_id *key)
if (!map->map.cmpfn)
oidmap_init(map, 0);
- hashmap_entry_init(&entry, hash(key));
+ hashmap_entry_init(&entry, oidhash(key));
return hashmap_remove(&map->map, &entry, key);
}
if (!map->map.cmpfn)
oidmap_init(map, 0);
- hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
+ hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
return hashmap_put(&map->map, to_put);
}
{
memset(&set->set, 0, sizeof(set->set));
if (initial_size)
- kh_resize_oid(&set->set, initial_size);
+ kh_resize_oid_set(&set->set, initial_size);
}
int oidset_contains(const struct oidset *set, const struct object_id *oid)
{
- khiter_t pos = kh_get_oid(&set->set, *oid);
+ khiter_t pos = kh_get_oid_set(&set->set, *oid);
return pos != kh_end(&set->set);
}
int oidset_insert(struct oidset *set, const struct object_id *oid)
{
int added;
- kh_put_oid(&set->set, *oid, &added);
+ kh_put_oid_set(&set->set, *oid, &added);
return !added;
}
int oidset_remove(struct oidset *set, const struct object_id *oid)
{
- khiter_t pos = kh_get_oid(&set->set, *oid);
+ khiter_t pos = kh_get_oid_set(&set->set, *oid);
if (pos == kh_end(&set->set))
return 0;
- kh_del_oid(&set->set, pos);
+ kh_del_oid_set(&set->set, pos);
return 1;
}
void oidset_clear(struct oidset *set)
{
- kh_release_oid(&set->set);
+ kh_release_oid_set(&set->set);
oidset_init(set, 0);
}
+
+void oidset_parse_file(struct oidset *set, const char *path)
+{
+ FILE *fp;
+ struct strbuf sb = STRBUF_INIT;
+ struct object_id oid;
+
+ fp = fopen(path, "r");
+ if (!fp)
+ die("could not open object name list: %s", path);
+ while (!strbuf_getline(&sb, fp)) {
+ const char *p;
+ const char *name;
+
+ /*
+ * Allow trailing comments, leading whitespace
+ * (including before commits), and empty or whitespace
+ * only lines.
+ */
+ name = strchr(sb.buf, '#');
+ if (name)
+ strbuf_setlen(&sb, name - sb.buf);
+ strbuf_trim(&sb);
+ if (!sb.len)
+ continue;
+
+ if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
+ die("invalid object name: %s", sb.buf);
+ oidset_insert(set, &oid);
+ }
+ if (ferror(fp))
+ die_errno("Could not read '%s'", path);
+ fclose(fp);
+ strbuf_release(&sb);
+}
* A single oidset; should be zero-initialized (or use OIDSET_INIT).
*/
struct oidset {
- kh_oid_t set;
+ kh_oid_set_t set;
};
#define OIDSET_INIT { { 0 } }
*/
void oidset_clear(struct oidset *set);
+/**
+ * Add the contents of the file 'path' to an initialized oidset. Each line is
+ * an unabbreviated object name. Comments begin with '#', and trailing comments
+ * are allowed. Leading whitespace and empty or white-space only lines are
+ * ignored.
+ */
+void oidset_parse_file(struct oidset *set, const char *path);
+
struct oidset_iter {
- kh_oid_t *set;
+ kh_oid_set_t *set;
khiter_t iter;
};
struct ewah_bitmap *blobs;
struct ewah_bitmap *tags;
- khash_sha1 *bitmaps;
- khash_sha1 *reused;
+ kh_oid_map_t *bitmaps;
+ kh_oid_map_t *reused;
struct packing_data *to_pack;
struct bitmapped_commit *selected;
seen_objects_nr = 0;
}
-static uint32_t find_object_pos(const unsigned char *hash)
+static uint32_t find_object_pos(const struct object_id *oid)
{
- struct object_entry *entry = packlist_find(writer.to_pack, hash, NULL);
+ struct object_entry *entry = packlist_find(writer.to_pack, oid, NULL);
if (!entry) {
die("Failed to write bitmap index. Packfile doesn't have full closure "
- "(object %s is missing)", hash_to_hex(hash));
+ "(object %s is missing)", oid_to_hex(oid));
}
return oe_in_pack_pos(writer.to_pack, entry);
static void show_object(struct object *object, const char *name, void *data)
{
struct bitmap *base = data;
- bitmap_set(base, find_object_pos(object->oid.hash));
+ bitmap_set(base, find_object_pos(&object->oid));
mark_as_seen(object);
}
add_to_include_set(struct bitmap *base, struct commit *commit)
{
khiter_t hash_pos;
- uint32_t bitmap_pos = find_object_pos(commit->object.oid.hash);
+ uint32_t bitmap_pos = find_object_pos(&commit->object.oid);
if (bitmap_get(base, bitmap_pos))
return 0;
- hash_pos = kh_get_sha1(writer.bitmaps, commit->object.oid.hash);
+ hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);
if (hash_pos < kh_end(writer.bitmaps)) {
struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
bitmap_or_ewah(base, bc->bitmap);
struct bitmap *base = bitmap_new();
struct rev_info revs;
- writer.bitmaps = kh_init_sha1();
+ writer.bitmaps = kh_init_oid_map();
writer.to_pack = to_pack;
if (writer.show_progress)
if (i >= reuse_after)
stored->flags |= BITMAP_FLAG_REUSE;
- hash_pos = kh_put_sha1(writer.bitmaps, object->oid.hash, &hash_ret);
+ hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);
if (hash_ret == 0)
die("Duplicate entry when writing index: %s",
oid_to_hex(&object->oid));
if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
return;
- writer.reused = kh_init_sha1();
+ writer.reused = kh_init_oid_map();
rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
writer.show_progress);
/*
*/
}
-static struct ewah_bitmap *find_reused_bitmap(const unsigned char *sha1)
+static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
{
khiter_t hash_pos;
if (!writer.reused)
return NULL;
- hash_pos = kh_get_sha1(writer.reused, sha1);
+ hash_pos = kh_get_oid_map(writer.reused, *oid);
if (hash_pos >= kh_end(writer.reused))
return NULL;
if (next == 0) {
chosen = indexed_commits[i];
- reused_bitmap = find_reused_bitmap(chosen->object.oid.hash);
+ reused_bitmap = find_reused_bitmap(&chosen->object.oid);
} else {
chosen = indexed_commits[i + next];
for (j = 0; j <= next; ++j) {
struct commit *cm = indexed_commits[i + j];
- reused_bitmap = find_reused_bitmap(cm->object.oid.hash);
+ reused_bitmap = find_reused_bitmap(&cm->object.oid);
if (reused_bitmap || (cm->object.flags & NEEDS_BITMAP) != 0) {
chosen = cm;
break;
static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
const struct object_id *oid)
{
- khash_oid_pos *positions = bitmap_git->ext_index.positions;
+ kh_oid_pos_t *positions = bitmap_git->ext_index.positions;
khiter_t pos = kh_get_oid_pos(positions, *oid);
if (pos < kh_end(positions)) {
int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
struct packing_data *mapping,
- khash_sha1 *reused_bitmaps,
+ kh_oid_map_t *reused_bitmaps,
int show_progress)
{
uint32_t i, num_objects;
reposition = xcalloc(num_objects, sizeof(uint32_t));
for (i = 0; i < num_objects; ++i) {
- const unsigned char *sha1;
+ struct object_id oid;
struct revindex_entry *entry;
struct object_entry *oe;
entry = &bitmap_git->pack->revindex[i];
- sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr);
- oe = packlist_find(mapping, sha1, NULL);
+ nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
+ oe = packlist_find(mapping, &oid, NULL);
if (oe)
reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
if (!rebuild_bitmap(reposition,
lookup_stored_bitmap(stored),
rebuild)) {
- hash_pos = kh_put_sha1(reused_bitmaps,
- stored->oid.hash,
- &hash_ret);
+ hash_pos = kh_put_oid_map(reused_bitmaps,
+ stored->oid,
+ &hash_ret);
kh_value(reused_bitmaps, hash_pos) =
bitmap_to_ewah(rebuild);
}
struct packed_git **packfile,
uint32_t *entries, off_t *up_to);
int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
- khash_sha1 *reused_bitmaps, int show_progress);
+ kh_oid_map_t *reused_bitmaps, int show_progress);
void free_bitmap_index(struct bitmap_index *);
/*
#include "config.h"
static uint32_t locate_object_entry_hash(struct packing_data *pdata,
- const unsigned char *sha1,
+ const struct object_id *oid,
int *found)
{
uint32_t i, mask = (pdata->index_size - 1);
- i = sha1hash(sha1) & mask;
+ i = oidhash(oid) & mask;
while (pdata->index[i] > 0) {
uint32_t pos = pdata->index[i] - 1;
- if (hasheq(sha1, pdata->objects[pos].idx.oid.hash)) {
+ if (oideq(oid, &pdata->objects[pos].idx.oid)) {
*found = 1;
return i;
}
for (i = 0; i < pdata->nr_objects; i++) {
int found;
uint32_t ix = locate_object_entry_hash(pdata,
- entry->idx.oid.hash,
+ &entry->idx.oid,
&found);
if (found)
}
struct object_entry *packlist_find(struct packing_data *pdata,
- const unsigned char *sha1,
+ const struct object_id *oid,
uint32_t *index_pos)
{
uint32_t i;
if (!pdata->index_size)
return NULL;
- i = locate_object_entry_hash(pdata, sha1, &found);
+ i = locate_object_entry_hash(pdata, oid, &found);
if (index_pos)
*index_pos = i;
uint32_t index_pos);
struct object_entry *packlist_find(struct packing_data *pdata,
- const unsigned char *sha1,
+ const struct object_id *oid,
uint32_t *index_pos);
static inline uint32_t pack_name_hash(const char *name)
#include "object-store.h"
#include "midx.h"
#include "commit-graph.h"
+#include "promisor-remote.h"
char *odb_pack_name(struct strbuf *buf,
const unsigned char *sha1,
return 0;
}
-void release_pack_memory(size_t need)
-{
- size_t cur = pack_mapped;
- while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
- ; /* nothing */
-}
-
void close_pack_windows(struct packed_git *p)
{
while (p->windows) {
close_commit_graph(o);
}
+void unlink_pack_path(const char *pack_name, int force_delete)
+{
+ static const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
+ int i;
+ struct strbuf buf = STRBUF_INIT;
+ size_t plen;
+
+ strbuf_addstr(&buf, pack_name);
+ strip_suffix_mem(buf.buf, &buf.len, ".pack");
+ plen = buf.len;
+
+ if (!force_delete) {
+ strbuf_addstr(&buf, ".keep");
+ if (!access(buf.buf, F_OK)) {
+ strbuf_release(&buf);
+ return;
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(exts); i++) {
+ strbuf_setlen(&buf, plen);
+ strbuf_addstr(&buf, exts[i]);
+ unlink(buf.buf);
+ }
+
+ strbuf_release(&buf);
+}
+
/*
* The LRU pack is the one with the oldest MRU window, preferring packs
* with no used windows, or the oldest mtime if it has no windows allocated.
}
}
-static void try_to_free_pack_memory(size_t size)
-{
- release_pack_memory(size);
-}
-
struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
{
- static int have_set_try_to_free_routine;
struct stat st;
size_t alloc;
struct packed_git *p;
- if (!have_set_try_to_free_routine) {
- have_set_try_to_free_routine = 1;
- set_try_to_free_routine(try_to_free_pack_memory);
- }
-
/*
* Make sure a corresponding .pack file exists and that
* the index looks sane.
static int promisor_objects_prepared;
if (!promisor_objects_prepared) {
- if (repository_format_partial_clone) {
+ if (has_promisor_remote()) {
for_each_packed_object(add_promisor_object,
&promisor_objects,
FOR_EACH_OBJECT_PROMISOR_ONLY);
void clear_delta_base_cache(void);
struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+/*
+ * Unlink the .pack and associated extension files.
+ * Does not unlink if 'force_delete' is false and the pack-file is
+ * marked as ".keep".
+ */
+void unlink_pack_path(const char *pack_name, int force_delete);
+
/*
* Make sure that a pointer access into an mmap'd index file is within bounds,
* and can provide at least 8 bytes of data.
return 0;
}
+struct option *parse_options_dup(const struct option *o)
+{
+ struct option *opts;
+ int nr = 0;
+
+ while (o && o->type != OPTION_END) {
+ nr++;
+ o++;
+ }
+
+ ALLOC_ARRAY(opts, nr + 1);
+ memcpy(opts, o - nr, sizeof(*o) * nr);
+ memset(opts + nr, 0, sizeof(*opts));
+ opts[nr].type = OPTION_END;
+ return opts;
+}
+
struct option *parse_options_concat(struct option *a, struct option *b)
{
struct option *ret;
continue;
}
- if (!arg[2]) { /* "--" */
+ if (!arg[2] /* "--" */ ||
+ !strcmp(arg + 2, "end-of-options")) {
if (!(ctx->flags & PARSE_OPT_KEEP_DASHDASH)) {
ctx->argc--;
ctx->argv++;
PARSE_OPT_COMP_ARG = 1024
};
+enum parse_opt_result {
+ PARSE_OPT_COMPLETE = -3,
+ PARSE_OPT_HELP = -2,
+ PARSE_OPT_ERROR = -1, /* must be the same as error() */
+ PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */
+ PARSE_OPT_NON_OPTION,
+ PARSE_OPT_UNKNOWN
+};
+
struct option;
typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
/*----- incremental advanced APIs -----*/
-enum parse_opt_result {
- PARSE_OPT_COMPLETE = -3,
- PARSE_OPT_HELP = -2,
- PARSE_OPT_ERROR = -1, /* must be the same as error() */
- PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */
- PARSE_OPT_NON_OPTION,
- PARSE_OPT_UNKNOWN
-};
-
/*
* It's okay for the caller to consume argv/argc in the usual way.
* Other fields of that structure are private to parse-options and should not
int parse_options_end(struct parse_opt_ctx_t *ctx);
+struct option *parse_options_dup(const struct option *a);
struct option *parse_options_concat(struct option *a, struct option *b);
/*----- some often used options -----*/
}
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int diff_header_only)
+ struct object_id *oid, int diff_header_only, int stable)
{
if (!patch_id_defined(commit))
return -1;
else
diff_root_tree_oid(&commit->object.oid, "", options);
diffcore_std(options);
- return diff_flush_patch_id(options, oid, diff_header_only);
+ return diff_flush_patch_id(options, oid, diff_header_only, stable);
}
/*
struct patch_id *b = (void *)entry_or_key;
if (is_null_oid(&a->patch_id) &&
- commit_patch_id(a->commit, opt, &a->patch_id, 0))
+ commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&a->commit->object.oid));
if (is_null_oid(&b->patch_id) &&
- commit_patch_id(b->commit, opt, &b->patch_id, 0))
+ commit_patch_id(b->commit, opt, &b->patch_id, 0, 0))
return error("Could not get patch ID for %s",
oid_to_hex(&b->commit->object.oid));
return !oideq(&a->patch_id, &b->patch_id);
struct object_id header_only_patch_id;
patch->commit = commit;
- if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
+ if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
return -1;
- hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
+ hashmap_entry_init(patch, oidhash(&header_only_patch_id));
return 0;
}
};
int commit_patch_id(struct commit *commit, struct diff_options *options,
- struct object_id *oid, int);
+ struct object_id *oid, int, int);
int init_patch_ids(struct repository *, struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
}
/*
- * If path ends with suffix (complete path components), returns the
- * part before suffix (sans trailing directory separators).
- * Otherwise returns NULL.
+ * If path ends with suffix (complete path components), returns the offset of
+ * the last character in the path before the suffix (sans trailing directory
+ * separators), and -1 otherwise.
*/
-char *strip_path_suffix(const char *path, const char *suffix)
+static ssize_t stripped_path_suffix_offset(const char *path, const char *suffix)
{
int path_len = strlen(path), suffix_len = strlen(suffix);
while (suffix_len) {
if (!path_len)
- return NULL;
+ return -1;
if (is_dir_sep(path[path_len - 1])) {
if (!is_dir_sep(suffix[suffix_len - 1]))
- return NULL;
+ return -1;
path_len = chomp_trailing_dir_sep(path, path_len);
suffix_len = chomp_trailing_dir_sep(suffix, suffix_len);
}
else if (path[--path_len] != suffix[--suffix_len])
- return NULL;
+ return -1;
}
if (path_len && !is_dir_sep(path[path_len - 1]))
- return NULL;
- return xstrndup(path, chomp_trailing_dir_sep(path, path_len));
+ return -1;
+ return chomp_trailing_dir_sep(path, path_len);
+}
+
+/*
+ * Returns true if the path ends with components, considering only complete path
+ * components, and false otherwise.
+ */
+int ends_with_path_components(const char *path, const char *components)
+{
+ return stripped_path_suffix_offset(path, components) != -1;
+}
+
+/*
+ * If path ends with suffix (complete path components), returns the
+ * part before suffix (sans trailing directory separators).
+ * Otherwise returns NULL.
+ */
+char *strip_path_suffix(const char *path, const char *suffix)
+{
+ ssize_t offset = stripped_path_suffix_offset(path, suffix);
+
+ return offset == -1 ? NULL : xstrndup(path, offset);
}
int daemon_avoid_alias(const char *p)
const char *git_path_fetch_head(struct repository *r);
const char *git_path_shallow(struct repository *r);
+
+int ends_with_path_components(const char *path, const char *components);
+
#endif /* PATH_H */
emits gibberish on every call to gettext. To use it run the test suite
with it, e.g.:
- cd t && GIT_TEST_GETTEXT_POISON=YesPlease prove -j 9 ./t[0-9]*.sh
+ cd t && GIT_TEST_GETTEXT_POISON=true prove -j 9 ./t[0-9]*.sh
If tests break with it you should inspect them manually and see if
what you're translating is sane, i.e. that you're not translating
# idx - index of pack file, 1 index per 1 packfile
# midx - multi-pack index, for objects across multiple packfiles
# overlay mode - припокриващ режим (при изтеглянe)
+# incremental file нарастващ файл
+# split (commit-graphr) раздробен (граф с подавания)
+# clobber (a tag) презаписвам (етикет)
+# blame извеждане на авторство
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
msgstr ""
"Project-Id-Version: git 2.22\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-05 08:50+0200\n"
+"POT-Creation-Date: 2019-08-10 12:25+0300\n"
+"PO-Revision-Date: 2019-08-10 12:33+0300\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:174
+#: advice.c:180
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."
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Ð\91ележка: изÑ\82еглÑ\8fне на „%s“.\n"
+"Ð\91ележка: пÑ\80еминаване кÑ\8aм „%s“.\n"
"\n"
"Указателят „HEAD“ не е свързан. Може да разглеждате, да правите произволни\n"
"промени и да ги подавате. Ако изтеглите нещо друго, всички промени ще "
"забравени и никой клон няма да се промени.\n"
"\n"
"Ако искате да създадете нов клон, за да запазите подаванията си, можете да\n"
-"направите това като зададете име на клон към опцията „-b“ на командата\n"
-"„commit“. Например:\n"
+"направите това като зададете име на клон към опцията „-c“ на командата\n"
+"„switch“. Например:\n"
+"\n"
+" git switch -c ИМЕ_НА_НОВ_КЛОН\n"
"\n"
-" git checkout -b ИМЕ_НА_НОВ_КЛОН\n"
+"Може да отмените това действие с командата:\n"
"\n"
+" git switch -\n"
+"\n"
+"Може да спрете това съобщение със задаване на настройката „advice."
+"detachedHead“\n"
+"да е „false“.\n"
#: alias.c:50
msgid "cmdline ends with \\"
msgid "unclosed quote"
msgstr "кавичка без еш"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "непозната опция за знаците за интервали „%s“"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "опциите „--reject“ и „--3way“ са несъвместими"
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "опциите „--cached“ и „--3way“ са несъвместими"
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Липсва име на файл на ред %d от кръпката"
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на стар файл"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/"
"null“"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "грешен режим на ред №%d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "несъвместими заглавни части на редове №%d и №%d"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "част от кръпка без заглавна част на ред %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"След съкращаването на първите %d части от компонентите на пътя, в заглавната "
"част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "новият файл зависи от старото съдържание на файла"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "изтритият файл не е празен"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "новият файл „%s“ зависи от старото съдържание на файла"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритият файл „%s“ не е празен"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"при търсене за:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"в хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Преминаване към тройно сливане…\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Неуспешно преминаване към тройно сливане…\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4549
+#: apply.c:4529
#, 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:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "път"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "БРОЙ"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "действие"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "повече подробности"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове"
msgid "not a tree object: %s"
msgstr "не е обект-дърво: %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "текущата работна директория не е следена"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "само съхранение без компресиране"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "бързо компресиране"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "добро компресиране"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "хранилище"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "команда"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Опцията „--exec“ изисква „--remote“"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "грешка при декомпресиране с „deflate“ (%d)"
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
msgstr[0] "Двоично търсене: остава %d версия след тази %s\n"
msgstr[1] "Двоично търсене: остават %d версии след тази %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "Опциите „--contents“ и „--reverse“ са несъвместими"
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на диапазон по веригата на първите наследници"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "няма път на име „%s“ в „%s“"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
msgid "Not a valid branch point: '%s'."
msgstr "Неправилно място за начало на клон: „%s“"
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
msgid "Repository lacks these prerequisite commits:"
msgstr "В хранилището липсват следните необходими подавания:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "за проверката на пратка е необходимо хранилище"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Пратката съдържа следния указател:"
msgstr[1] "Пратката съдържа следните %d указатели:"
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Пратката съдържа пълна история."
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изисква следния указател:"
msgstr[1] "Пратката изисква следните %d указатели:"
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши успешно"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде създаден"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно"
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"Може да поправите подаването заедно със съобщението или може да\n"
"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "файлът с гра̀фа на подаванията е твърде малък"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "неправилно отместване на откъс: %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "откъсът %08x се явява многократно"
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "базовият откъс липсва в гра̀фа с подаванията"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "веригата на гра̀фа с подаванията не съвпада"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "подаването „%s“ не може да бъде открито"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "видът на обекта „%s“ не може да бъде определен"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "Разширяване на достижимите подавания в гра̀фа"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл"
msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "грешка при добавяне на пакетен файл „%s“"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "грешка при отваряне на индекса на „%s“"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Откриване на подаванията в гра̀фа измежду %d указател"
msgstr[1] "Откриване на подаванията в гра̀фа измежду %d указатели"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Преброяване на различните подавания в гра̀фа"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Откриване на още върхове в гра̀фа с подаванията"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "пÑ\80екалено много подаваниÑ\8f за запиÑ\81ване на гÑ\80аÌ\80Ñ\84а"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "пÑ\80авилниÑ\8fÑ\82 бÑ\80ой на базовиÑ\82е иденÑ\82иÑ\84икаÑ\82оÑ\80и не може да Ñ\81е запиÑ\88е"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетният файл „%s“ не може да бъде създаден"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Запазване на гра̀фа с подаванията в %d пас"
msgstr[1] "Запазване на гра̀фа с подаванията в %d паса"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Търсене на подаванията със сливания"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "неочакван, повтарящ се идентификатор на подаване: %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Сливане на гра̀фа с подаванията"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "прекалено много подавания за записване на гра̀фа"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
"е преди „%s“, а не трябва"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
"трябва да е %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Проверка на подаванията в гра̀фа"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
"анализира"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
"подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
"не е"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
"другаде е"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а "
"другаде е %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB „%s“: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на командния ред „%s“: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва "
"стандартната стойност „keep“ (запазване)"
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
"регулярният израз на групата в конфигурационния файл съдържа повече от "
"максимално поддържаните (%d) прихващащи групи"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Отбелязани са %d групи, работата приключи.\n"
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "неправилна стойност за „--stat“: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "опцията „%s“ очаква число за аргумент"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"извеждане на контекст между последователните парчета с разлики от указания "
"БРОЙ редове"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "действието завърши"
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Сървърът не поддържа плитки клиенти"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Сървърът поддържа „multi_ack_detailed“"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Сървърът поддържа „no-done“"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Сървърът поддържа „multi_ack“"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Сървърът поддържа „side-band-64k“"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Сървърът поддържа „side-band“"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Сървърът поддържа „ofs-delta“"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Сървърът поддържа филтри"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Сървърът поддържа „%s“"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Сървърът не поддържа плитки клиенти"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Сървърът поддържа филтри"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
-msgstr "Сървърът не позволява заявка за необявен „%s“"
+msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "Програмата „gpg“ не подписа данните."
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
msgid "These are common Git commands used in various situations:"
msgstr "Това са най-често използваните команди на Git:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "неподдържан списък от команди „%s“"
"\n"
"Изпълнете:\n"
"\n"
-" git config --global user.email \"ИМЕ@example.com\"\n"
-" git config --global user.name \"ВАШЕТО ИМЕ\"\n"
+" git config --global user.email \"ИМЕ@example.com\"\n"
+" git config --global user.name \"ВАШЕТО ИМЕ\"\n"
"\n"
"и въведете данни за себе си.\n"
"Ако пропуснете опцията „--global“, самоличността е само за текущото "
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
msgid "sparse:path filters support has been dropped"
msgstr "поддръжката на филтри със „sparse:path“ е премахната"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "неправилен филтър: „%s“"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "не може да промените хранилището-гарант на непълно хранилище"
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
"подаванията)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Превъртане на подмодула „%s“ до следното подаване:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Превъртане на подмодула „%s“"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества "
"от подаванията)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
"Открито е сливане, което може да решава проблема със сливането на "
"подмодула:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"Това приема предложеното.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото: %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Преустановяване на действието, за да не се изгуби неследеният файл „%s“. "
"Вместо него се добавя „%s“"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, 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:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"постави „%s“, защото няколко нови директории поделят съдържанието на "
"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"съответства на „%s“. Косвено преименуване на директория води до поставянето "
"на тези пътища там: %s."
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
"„%s“ също е с променено име."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "съдържание"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
"„%s“. Обектът се мести в „%s“."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
"преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
"преименувана в „%s“. Обектът се мести в „%s“."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, 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:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"Сливането ще презапише локалните промени на тези файлове:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "версията на отпечатъка %u не съвпада"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "неправилно (прекалено голямо) отместване на откъс"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"идентификаторът за краен откъс на индекс за множество пакети се явява по-"
"рано от очакваното"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
"грешка при създаването на пакетен файл на базата на индекс за множество "
"пакети"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетният файл за триене „%s“ не може да се открие"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr ""
"Проверка на подредбата на идентификатори на обекти в MIDX (файл с индекс към "
"множество пакетни файлове)"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "командата „pack-objects“ не може да бъде стартирана"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "командата „pack-objects“ не може да бъде завършена"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "не може да се създаде нишка за директории: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "не може да се създаде нишка за имена: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "не може да се изчака нишка за имена: %s"
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "заглавната част на git „%.*s“ не може да се анализира"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "журналът с подаванията на „%s“ не може да бъде анализиран"
msgstr "неподредени записи за „%s“"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
msgid "broken index, expect %s in %s, got %s"
msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Не изтривайте редове. Подаванията могат да се прескачат с командата "
"„drop“.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Празните подавания са коментирани"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "„%s“ не може да се запише"
"предупреждение)\n"
"или „error“ (считане за грешка).\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "„%s“ не сочи към позволен обект!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "игнориране на указател на обект извън клон „%s“"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "„%s“ не може да бъде отворен за запис: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "указателят „%s“ не може да се прочете"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "указателят „%s“ вече съществува"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "неочакван идентификатор на обект при записването на „%s“"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "неочакван идентификатор на обект при изтриването на „%s“"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "журналът с подаванията за указателя „%s“ е празен"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "указател не може да се обнови с грешно име „%s“"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "неуспешно обновяване на указателя „%s“: %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "не са позволени повече от една промени на указателя „%s“"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "„%s“ съществува, не може да се създаде „%s“"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
msgid "invalid refspec '%s'"
msgstr "неправилен указател: „%s“"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "изтрит"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "напред с %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "назад с %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "непознат аргумент за %%(objectsize): %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) не приема аргументи"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) не приема аргументи"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "очаква се положителна стойност за „objectname:short=%s“"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "непознат аргумент за %%(objectname): %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "непознат аргумент за „%%(if)“: %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(извън клон, пребазиране на „%s“)"
-
-#: ref-filter.c:1456
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
+msgid "no branch, rebasing %s"
+msgstr "извън клон, пребазиране на „%s“"
-#: ref-filter.c:1459
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(извън клон, двоично търсене от „%s“)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
-#, 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:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "УказаÑ\82елÑ\8fÑ\82 â\80\9eHEADâ\80\9c не е Ñ\81вÑ\8aÑ\80зан и е оÑ\82делеÌ\80н от „%s“"
+msgid "no branch, bisect started on %s"
+msgstr "извÑ\8aн клон, двоиÑ\87но Ñ\82Ñ\8aÑ\80Ñ\81ене от „%s“"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(извън клон)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "извън клон"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "опциите „%s“ и „--merged“ са несъвместими"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "опциите „%s“ и „--no-merged“ са несъвместими"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
msgid "unable to open rr-cache directory"
msgstr "директорията „rr-cache“ не може да се отвори"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "„%s“ не може да бъде изтрит"
+
+#: sequencer.c:321
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "неправилен формат на дата „%s“ в „%s“"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "запазване на начално подаване"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, 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:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "от „%s“ не може да се чете."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "преустановяване на извършваното в момента отбиране на подавания"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "преустановяване на извършваното в момента отмяна на подаване"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr ""
-"в момента вече се извършва отбиране на подавания или пребазиране на клона"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "в момента вече се извършва отмяна на подавания"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "използвайÑ\82е â\80\9egit cherry-pick (--continue | --quit | --abort)â\80\9c"
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "в моменÑ\82а веÑ\87е Ñ\81е извÑ\8aÑ\80Ñ\88ва оÑ\82биÑ\80ане на подаваниÑ\8f"
-#: sequencer.c:2660
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "директорията за секвенсора „%s“ не може да бъде създадена"
+msgstr ""
+"директорията за определянето на последователността „%s“ не може да бъде "
+"създадена"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "в момента не тече пребазиране"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "в момента не се извършва отбиране на подавания"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "неуспешно прескачане на подаването"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "няма какво да се прескочи"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"подали ли сте вече? Пробвайте с:\n"
+"\n"
+" git %s --continue"
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
-msgstr "и промени индекса и/или работното дърво\n"
+msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "дървото, сочено от „%s“, не може да бъде открито"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "индексът не може да бъде записан"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "„%s“ е неправилен идентификатор на обект"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "промените в индекса не могат да бъдат подадени."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"continue“ след това.\n"
"Може и да преустановите пребазирането с командата „git rebase --abort“.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "неуспешно изпълнение на „mmap“"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "файлът с обектите „%s“ е празен"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "непакетираният обект „%s“ е повреден"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "грешни данни в края на непакетирания обект „%s“"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "неправилен вид обект"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
"type“"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "файлът „%s“ не може да бъде записан"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "правата за достъп до „%s“ не могат да бъдат зададени"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "грешка при запис на файл"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "грешка при затварянето на файла с непакетиран обект"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "не може да бъде създаден временен файл"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "грешка при записа на файла с непакетиран обект"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "обектът за „%s“ не може да се прочете"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "повредено подаване"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "повреден етикет"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "грешка при четене по време на индексиране на „%s“"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "непълно прочитане по време на индексиране на „%s“"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "„%s“ не може да се вмъкне в базата от данни"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "неподдържан вид файл: „%s“"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "„%s“ е неправилен обект"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "„%s“ е неправилен обект от вид „%s“"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
"Възможно е такива указатели да са създадени случайно. Например:\n"
"\n"
-" git checkout -b $BRANCH $(git rev-parse…)\n"
+" git switch -c $BRANCH $(git rev-parse …)\n"
"\n"
"където стойността на променливата на средата BRANCH е празна, при което се\n"
-"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете "
+"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Може "
"да\n"
"спрете това съобщение като изпълните командата:\n"
-"„git config advice.objectNameWarning false“"
+"\n"
+" git config advice.objectNameWarning false"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u байт/сек."
+msgstr[1] "%u байта/сек."
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
msgid "Submodule '%s' could not be updated."
msgstr "Подмодулът „%s“ не може да се обнови."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "опцията не се поддържа от протокола"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "неуспешен пълен запис към насрещната помощна програма"
msgid "error while running fast-import"
msgstr "грешка при изпълнението на бързо внасяне"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "указателят „%s“ не може да се прочете"
msgid "helper %s does not support 'push-option'"
msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"насрещната помощна програма не поддържа изтласкване. Необходимо е "
"изброяване на указателите"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "не може да се извърши бързо изнасяне"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "грешка при изпълнението на командата за бързо изнасяне"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n"
"направено. Пробвайте да укажете клон, напр. “master“.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "неправилен отговор в списъка с указатели: „%s“"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "неуспешно четене на „%s“"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "неуспешен запис в „%s“"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "неуспешно изпълнение на нишката „%s“"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "неуспешно изпълнение на „%s“"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "неуспешно стартиране на нишка за копиране на данните"
msgid "empty filename in tree entry"
msgstr "празно име на файл в запис в дърво"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
msgstr "Преустановяване на действието\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Ð\98зÑ\82еглÑ\8fне на файлове"
+msgid "Updating files"
+msgstr "Ð\9eбновÑ\8fване на файлове"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "неправилна част от пътя „..“"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Неслети пътища:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (използвайте „git restore --staged ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (използвайте „git restore --source=%s --staged ФАЙЛ…“, за да извадите "
+"ФАЙЛа от индекса)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за "
"конфликта)"
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в "
-"работното дърво)"
+" (използвайте „git restore ФАЙЛ…“, за да отхвърлите промените в работната "
+"директория)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (подайте или отхвърлете неследеното или промененото съдържание в "
"подмодулите)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "изтрити в двата случая:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "добавени от вас:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "изтрити от тях:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "добавени от тях:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "изтрити от вас:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "добавени и в двата случая:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "променени и в двата случая:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "нов файл:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "копиран:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "изтрит:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "променен:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "преименуван:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "смяна на вида:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "непозната промяна:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "неслят:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "нови подавания, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "променено съдържание, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:896
+#: wt-status.c:906
#, 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:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
+"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Ð\9fоÑ\81ледна изпълнена команда (изпълнена е общо %d команда):"
-msgstr[1] "Ð\9fоÑ\81ледна изпÑ\8aлнена команда (изпълнени са общо %d команди):"
+msgstr[0] "Ð\9fоÑ\81ледно изпълнена команда (изпълнена е общо %d команда):"
+msgstr[1] "Ð\9fоÑ\81ледно изпÑ\8aлнени команди (изпълнени са общо %d команди):"
-#: wt-status.c:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
-msgstr " повече информация има във файла „%s“)"
+msgstr " (повече информация има във файла „%s“)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Следваща команда за изпълнение (остава още %d команда):"
-msgstr[1] "СледваÑ\89а команда за изпълнение (остават още %d команди):"
+msgstr[1] "СледваÑ\89и команди за изпълнение (остават още %d команди):"
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "В момента се извършва отбиране на подавания."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "В момента тече отмяна на подаване."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git revert --continue“)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "Указателят „HEAD“ не е свързан и е при "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
msgstr ""
"Бяха необходими %.2f секунди за изброяването на неследените файлове.\n"
"Добавянето на опцията „-uno“ към командата „git status“, ще ускори\n"
-"изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n"
+"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, 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:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "различен"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
+#: compat/precompose_utf8.c:58 builtin/clone.c:453
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "неуспешно изтриване на „%s“"
+
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "пробно изпълнение"
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
msgid "Failed to split patches."
msgstr "Кръпките не могат да бъдат разделени."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Кръпката не може да се приложи към обектите-BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"За интерактивно изпълнение е необходимо стандартният\n"
-"вход да е свързан с терминал, а в момента не е."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте опцията „git am --show-"
"current-patch“ to see the failed patch"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "показване на прилаганата кръпка."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Открита е излишна директория „%s“.\n"
"Можете да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "интерактивният режим изисква кръпки на командния ред"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [ОПЦИЯ…] [КРЪПКА…]"
msgid "bad HEAD - strange symbolic ref"
msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "неправилен указател: „%s“"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "извършване на „git bisect next“"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "проверка за очакваните версии"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr ""
"проверка и задаване на управляващи думи към състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "извеждане на управляващите думи"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "начало на двоично търсене"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "липсва запис за „BISECT_WRITE“"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "опцията „--write-terms“ изисква точно 2 аргумента"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "опцията „--bisect-clean-state“ не приема аргументи"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "трябва да е цвят: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "трябва да завършва с цвят"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "неправилна стойност за „blame.coloring“"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "версията за прескачане „%s“ не може да бъде открита"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
-msgstr "Ð\98звеждане на аноÑ\82аÑ\86ииÑ\82е Ñ\81 намиÑ\80анеÑ\82о им, последователно"
+msgstr "Ð\98звеждане на авÑ\82оÑ\80Ñ\81Ñ\82воÑ\82о Ñ\81 намиÑ\80анеÑ\82о мÑ\83, последователно"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията "
"е изключена)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Извеждане на статистика за извършените действия"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Принудително извеждане на напредъка"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
-msgstr "Ð\98звеждане на допÑ\8aлниÑ\82елна инÑ\84оÑ\80маÑ\86иÑ\8f за опÑ\80еделÑ\8fнеÑ\82о на аноÑ\82аÑ\86ииÑ\82е"
+msgstr "Ð\98звеждане на допÑ\8aлниÑ\82елна инÑ\84оÑ\80маÑ\86иÑ\8f за опÑ\80еделÑ\8fнеÑ\82о на авÑ\82оÑ\80Ñ\81Ñ\82воÑ\82о"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr ""
"Извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr ""
"Извеждане на първоначалният номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Без разлики в знаците за интервали"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "ВЕРС"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Прескачане на ВЕРСията при извеждане на авторството"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
"оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "оцветяване на редовете по възраст"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Подобряване на разликите чрез експериментална евристика"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr ""
"Търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr ""
"Търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Информация само за редовете в диапазона от n до m включително. Броенето "
"започва от 1"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
-msgstr "Ð\90ноÑ\82иÑ\80ани Ñ\80едове"
+msgstr "Редове Ñ\81 авÑ\82оÑ\80Ñ\81Ñ\82во"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на следящия клон „%s“"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
"отдалечените клони"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "без клон-източник"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "извеждане на името на текущия клон"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
+"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "може да укажете само една пакетна опция"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта-BLOB"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "обект-BLOB"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "без подреждане на изхода от „--batch-all-objects“"
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
msgstr "записване на съдържанието във временни файлове"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "НИЗ"
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това състояние на сливане"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [ОПЦИЯ…] КЛОН"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [ОПЦИЯ…] КЛОН"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Пресъздаден е %d конфликт при сливане"
+msgstr[1] "Пресъздадени са %d конфликта при сливане"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Обновен е %d път от „%s“"
+msgstr[1] "Обновени са %d пътя от „%s“"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Обновен е %d път от индекса"
+msgstr[1] "Обновени са %d пътя от индекса"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "Ð\9eпцията „%s“ е несъвместима с обновяването на пътища"
+msgstr "опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "Ð\9eпцията „%s“ е несъвместима с „%s“"
+msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "пÑ\8aÑ\82Ñ\8fÑ\82 â\80\9e%sâ\80\9c не е Ñ\81лÑ\8fÑ\82"
+msgid "neither '%s' or '%s' is specified"
+msgstr "не е Ñ\83казано ниÑ\82о â\80\9e%sâ\80\9c, ниÑ\82о â\80\9e%sâ\80\9c"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Пресъздаден е %d конфликт при сливане"
-msgstr[1] "Пресъздадени са %d конфликта при сливане"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "Обновен е %d път от „%s“"
-msgstr[1] "Обновени са %d пътя от „%s“"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "Обновен е %d път от индекса"
-msgstr[1] "Обновени са %d пътя от индекса"
+msgid "path '%s' is unmerged"
+msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"индекса:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr "локалните промени в тези файлове ще се презапишат: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"Ако все пак искате да запазите тази промяна чрез създаване на клон,\n"
"сега е най-подходящият за това чрез командата:\n"
"\n"
-" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
+" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
msgstr[1] ""
"Ако все пак искате да запазите тези промени чрез създаване на клон,\n"
"сега е най-подходящият за това чрез командата:\n"
"\n"
-" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
+" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
-msgstr "В момента сте на клон, който предстои да бъде създаден"
+msgstr "В момента сте на клон, който все още не е създаден"
+
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "очаква се само един указател"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
-msgstr "очакваше се един указател, а сте подали %d."
+msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-"„%s“ може да е както локален файл, така и следящ клон. За доуточвяване\n"
+"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "очаква се клон, а не етикет — „%s“"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "очаква се локален, а не отдалечен клон — „%s“"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "очаква се клон, а не „%s“"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "очаква се клон, а не подаване — „%s“"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на сливане не може да преминете към друг клон.\n"
+"Пробвайте с „git merge --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на прилагане на поредица от кръпки не може да преминете към друг "
+"клон.\n"
+"Пробвайте с „git am --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на пребазиране не може да преминете към друг клон.\n"
+"Пробвайте с „git rebase --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на отбиране на подавания не може да преминете към друг клон.\n"
+"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"по време на отмяна на подавания не може да преминете към друг клон.\n"
+"Пробвайте с „git revert --quit“ или „git worktree add“."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "преминаване към друг клон по време на двоично търсене"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "клон"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "създаване и преминаване към нов клон"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "създаване/зануляване на клон и преминаване към него"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "създаване на журнал на указателите за нов клон"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "СТИЛ"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "обновяване на игнорираните файлове (стандартно)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "без проверка дали друго работно дърво държи указателя"
+
+#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "извършване на тройно сливане с новия клон"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "обновяване на игнорираните файлове (стандартно)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "СТИЛ"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "действие при конфликт (сливане или тройна разлика)"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr ""
-"без опит за отгатване на име на клон след неуспешен опит с „git checkout "
-"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "без проверка дали друго работно дърво държи указателя"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "извеждане на напредъка"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "използване на припокриващ режим (стандартно)"
-
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "опциите „-p“ и „--overlay“ са несъвместими"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "„%s“ не може да бъде открит"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "трябва да укажете поне един път за възстановяване"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"\n"
" checkout.defaultRemote=origin"
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "клон"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "създаване и преминаване към нов клон"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "създаване/зануляване на клон и преминаване към него"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "създаване на журнал на указателите за нов клон"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"опит за отгатване на име на клон след неуспешен опит с „git checkout "
+"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "използване на припокриващ режим (стандартно)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "създаване и преминаване към нов клон"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "създаване/зануляване на клон и преминаване към него"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+"опит за отгатване на име на клон след неуспешен опит с „git switch "
+"НЕСЪЩЕСТВУВАЩ_КЛОН“"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "зануляване на локалните промени"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "към кой указател към дърво да се премине"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "възстановяване на индекса"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "възстановяване на работното дърво (стандартно)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "пренебрегване на неслетите елементи"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "използване на припокриващ режим"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "не може да се получи информация чрез „lstat“ за „%s“\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
#
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Избор на следващо действие"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "път"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
-msgstr "веÑ\80Ñ\81иÑ\8f"
+msgstr "Ð\92Ð\95РСÐ\98Я"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
"зададения с „--branch“"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"без клониране на етикети, като последващите доставяния няма да ги следят"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "всички клонирани подмодули ще ползват следящите си клони"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "директорията „%s“ не може да бъде отворена"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:427
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
-
-#: builtin/clone.c:444
+#: builtin/clone.c:428
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "неуспешно изтриване на „%s“"
+msgid "failed to start iterator over '%s'"
+msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "неуспешно итериране по „%s“"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Клонирането бе успешно за разлика от подготовката на работното дърво\n"
"за определен клон. Все пак можете да проверите кои файлове и от кой\n"
"клон в момента са изтеглени с командата „git status“. Можете да\n"
-"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
+"завършите изтеглянето на клона с командата:\n"
+"\n"
+" git restore --source=HEAD :/\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
msgid "duplicate parent %s ignored"
msgstr "прескачане на повтарящ се родител: „%s“"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
msgid "id of a parent commit object"
msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
msgid "read commit log message from file"
msgstr "изчитане на съобщението за подаване от ФАЙЛ"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "В противен случай използвайте командата „git reset“\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr ""
+"В противен случай използвайте командата:\n"
+"\n"
+" git cherry-pick --skip\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Ако искате да прескочите това подаване, използвайте командата:\n"
+"след това изпълнете:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"и ще продължите да отбирате останалите подавания.\n"
+"За да прескочите това подаване, изпълнете:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
-"останалите подавания.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "новият индекс не може да бъде записан"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\n"
"Изглежда, че подавате сливане. Ако това не е така, изтрийте файла:\n"
"\n"
-" %s\n"
+" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"Изглежда, че извършвате отбрано подаване. Ако това не е така, изтрийте "
"файла:\n"
"\n"
-" %s\n"
+" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не можете да поправяте."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"хранилището е обновено, но новият файл за индекс „new_index“\n"
"не е записан. Проверете дали дискът не е препълнен или не сте\n"
-"превишили дисковата си квота. След това изпълнете „git reset HEAD“."
+"превишили дисковата си квота. За възстановяване изпълнете:\n"
+"\n"
+" git restore --staged :/"
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir ДИР_ОБЕКТИ]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "директория"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Графът с подаванията не може да се отвори: „%s“"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "обхождането да започне от всички указатели"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"проверка на подаванията за индексите на пакетите изброени на командния ред"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "започване на обхождането при подаванията подадени на стандартния вход"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "максимален брой подавания в небазово ниво на раздробен граф"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"максимално отношение на броя подавания в две последователни нива в раздробен "
+"граф"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "непознат аргумент „--type“: %s"
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "стойността е от този вид"
"извеждане на мястото на задаване на настройката (файл, стандартен вход, "
"обект-BLOB, команден ред)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "СТОЙНОСТ"
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕНЛИВИ"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "ВИД"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "стандартна, резервна стойност за „git_env_*(…)“"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"без извеждане на информация — стойността на „git_env_*()“ да е изходен код"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"опцията „--default“ изисква булева стойност при „--type=bool“, а не „%s“"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"опцията „--default“ изисква целочислена стойност без знак при „--"
+"type=ulong“, а не „%s“"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"как да се обработват съобщенията за подаване, които са в друго кодиране"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Указване на родителите, които не са в потока на бързо изнасяне, с "
"идентификатор на обект"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "принудително презаписване на локален указател"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
-"Ñ\85Ñ\80анилиÑ\89е и маÑ\85ане на променените"
+"Ñ\85Ñ\80анилиÑ\89е и пÑ\80езапиÑ\81ване на променените"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти могат са достижими при започване от този"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "изпълняване на „gc --auto“ след доставяне"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "проверка за принудителни обновявания на всички клони"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"За да я включите еднократно ползвайте опцията „--show-forced-updates“, а за "
+"да я включите за постоянно, изпълнете:\n"
+"\n"
+" git config fetch.showForcedUpdates true"
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите "
+"еднократно с опцията „--no-show-forced-updates“, а за да я извключите за "
+"постоянно, изпълнете:\n"
+"\n"
+" git config fetch.showForcedUpdates false\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
"настройката „extensions.partialClone“"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
msgstr "Проверка на връзките на „%s“"
#
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "неправилен указател „%s“"
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Проверка на обектите"
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулярния израз"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "опцията е несъвместима с „--recurse-submodules“"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "ВИД"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "ВИД на обекта"
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "неправилен низ за настройката „alias.%s“: „%s“"
msgid "'git help config' for more information"
msgstr "За повече информация изпълнете „git help config“"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетният файл „%s“ не може да бъде създаден"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "неочакван край на файл, липсва %<PRIuMAX> байт"
msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> байта"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект-BLOB „%s“"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "грешка при проверката на пакетирани обекти"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr ""
"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, 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:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "в пакета има %d ненапасваща разлика"
msgstr[1] "в пакета има %d ненапасващи разлики"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, 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:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "грешка при проверка с „fsck“ на пакетните обекти"
"указване, че хранилището на Git ще бъде споделено от повече от един "
"потребител"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да се влезе в директорията „%s“"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недостъпно"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "директно редактиране на файловете"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "изчистване на празните епилози"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "къде да се постави новият епилог"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "действие, ако епилог вече съществува"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "действие при липсващ епилог"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "извеждане само на епилозите"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "без прилагане на правилата за настройките"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "сливане на стойностите последване от знаци за интервали"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "опции при анализ"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "„---“ няма специално значение"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "епилог"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "епилози за добавяне"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "опцията „--trailer“ е несъвместима с „--name-only“"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "не е зададен входен файл за редактиране на място"
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr ""
"Използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване само на редовете във файла в диапазона от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "неизвестен вид: %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "не е диапазон"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "неуспешно създаване на придружаващо писмо"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "„%s“ не е указател или не сочи към нищо"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "неуспешно определяне на диапазоните за разлика"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "ВЕРС"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "опциите „-n“ и „-k“ са несъвместими"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "КОМАНДА"
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "опцията „%s“ изисква стойност"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(псевдоним на „--stat“)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "преустановяване без промяна на индекса и работното дърво"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr ""
"проверка на куката при промяна на съобщението при подаване (commit-msg)"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (няма какво да се вкара)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"В съобщението при подаване добавете информация за причината за\n"
"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Празно съобщение предотвратява подаването.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
"съобщение преустановява подаването.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "опцията „--quit“ не приема аргументи"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Опцията „--squash“ е несъвместима с „--commit“."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без история, всички сливания са превъртания, не може да се "
"извърши същинско сливане изисквано от опцията „--no-ff“"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Вече е обновено."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Вече е обновено!"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Не може да се извърши превъртане, преустановяване на действието."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr "разрешаване на създаването на повече от едно дърво"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify|expire|repack --"
+"batch-size=РАЗМЕР)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със "
"съответния им индекс"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
+"се обединяват в пакети с по-голям от този размер"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "прекалено много аргументи"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "опцията „--batch-size“ изисква подкомандата „repack“"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "непознат глагол: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "непозната подкоманда: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…"
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [ОПЦИЯ…] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [ОПЦИЯ…] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "извеждане само на имената (без сумите по SHA1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "използване само на етикетите за именуване на подаванията"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "използване само на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "игнориране на указателите напасващи на ШАБЛОНа"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"извеждане на всички подавания, които могат да бъдат достигнати от всички "
"указатели"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "четене от стандартния вход"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < "
"СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "лоша контролна сума за пакетирания обект „%s“"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "пакетиран обект с грешки за „%s“"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "рекурсивна разлика за обект „%s“"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "подредени бяха %u обекта, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "неправилен пакетен файл: „%s“"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "пакетният файл „%s“ не може да бъде повторно отворен"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "неуспешно търсене в преизползван пакетен файл"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "неуспешно четене от преизползван пакетен файл"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Преброяване на обектите"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "размерът на „%s“ не може да бъде получен"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "обектът „%s“ не може да се прочете"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "неоптимизиран пакет — паметта свърши"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Делта компресията ще използва до %d нишки"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
"обектите, които могат да бъдат достигнати от етикета „%s“, не може да бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "неправилен брой разлики"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"очаква се идентификатор на краен обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"очаква се идентификатор на обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "неправилна стойност за „--missing“"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "индексът на пакетния файл не може да бъде отворен"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да бъде наложено"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "неправилна версия „%s“"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "скорошните обекти не могат да бъдат добавени"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "използване на алгоритъм за частична достижимост"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "пропускане на този пакет"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "записване на индекси на база битови маски при възможност"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "как да се обработват липсващите обекти"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "без пакетиране на обекти в гарантиращи пакети"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "без промяна на групите при делта компресия"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
"Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се "
"ползва %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
"файлове за пренос"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "минималният размер на пакетите е 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "опцията „-filter“ изисква „-stdout“"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
msgstr ""
"Работното ви копие не може да бъде превъртяно.\n"
"След като запазите всичко необходимо посочено от командата:\n"
-" $ git diff %s\n"
+" git diff %s\n"
"изпълнете:\n"
-" $ git reset --hard\n"
+" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
msgid "keep empty commits"
msgstr "запазване на празните подавания"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "позволяване на празни съобщения при подаване"
msgid "sign commits"
msgstr "подписване на подаванията"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "извеждане на статистика с промените в следения клон"
msgid "the command to run"
msgstr "команда за изпълнение"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "„%s“ изисква интерактивно пребазиране"
msgid "Cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"В резултат те не могат да се пребазират."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "командите за изпълнение не може да съдържат нови редове"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "празна команда за изпълнение"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr ""
"добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "подава се на командата „git am“"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия за сливане"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(остаряло) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "запазване на празните подавания при пребазиране"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
"преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
" git merge-base --fork-point"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"поддръжката на „rebase.useBuiltin“ е премахната.\n"
"За повече информация вижте „git help config“."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
"нея."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не могат да бъдат занулени"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "„%s“ не може да бъде изтрит"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
+"interactive“"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"опциите за „am“ са несъвместими с опциите за сливане или за интерактивна "
"работа"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
"несъвместими"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "опциите „--rebase-merges“ и „--strategy-option“ са несъвместими"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "опциите „--rebase-merges“ и „--strategy“ са несъвместими"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Неочакван резултат при скатаване: „%s“"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Директорията за „%s“ не може да бъде създадена"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Автоматично скатано: „%s“\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "неуспешно изпълнение на „git reset --hard“"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която "
"пребазирате…\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се очакват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n"
"ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "филтрирането на обекти изисква опцията „--objects“"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "неправилна частична стойност: %s"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите"
msgid "cancel revert or cherry-pick sequence"
msgstr "отмяна на поредица от отбирания или отмени на подавания"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "прескачане на текущото подаване и продължаване"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "без автоматично подаване"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "редактиране на съобщението при подаване"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "номер на родителя"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "избор на основния родител"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "стратегия на сливане"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "опция за стратегията на сливане"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "добавяне на името на подаването"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "запазване на първоначално празните подавания"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
msgstr[0] "„%s“ се прескача — не може да се обработят повече от %d указател"
msgstr[1] "„%s“ се прескача — не може да се обработят повече от %d указатели"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "никой указател не съвпада с „%s“"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "извеждане на следящите и локалните клони"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "извеждане на следящите клони"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "оцветяване на „*!+-“ според клоните"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "извеждане на такъв БРОЙ подавания от общия предшественик"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "псевдоним на „more=-1“"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "без низове за имената на клоните"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "включване и на текущия клон"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "именуване на подаванията с имената им на обекти"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "извеждане на възможните бази за сливания"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "извеждане на недостижимите указатели"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "извеждане на подаванията в топологическа подредба"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "извеждане само на подаванията, които не са от първия клон"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "извеждане на сливанията, които могат да се достигнат само от един връх"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"топологическа подредба, при запазване на подредбата по дата, доколкото е\n"
"възможно"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "БРОЙ[,БАЗА]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показване на най-много БРОЙ журнални записа с начало съответната БАЗА"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"опцията „--reflog“ е несъвместима с опциите „--all“, „--remotes“, „--"
"independent“ и „--merge-base“"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "не е зададен клон, а указателят „HEAD“ е неправилен"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "опцията „--track“ изисква точно едно име на клон"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "такъв указател няма: %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, 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:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "„%s“ е неправилен указател."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "подаването „%s“ (%s) липсва"
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не могат да се запазят"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "„%s“ не може да се изпълни"
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
"изпълнената команда завърши с ненулев изход за „%s“\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"вложени в „%s“\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Без извеждане на изход при въвеждането на всяка команда за подмодули"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Рекурсивно обхождане на подмодулите"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Заглушаване на изхода за състоянието на подмодула"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "рекурсивно обхождане на подмодулите"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Синхронизиране на адреса на подмодул за „%s“\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Без извеждане на информация при синхронизирането на подмодул"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
msgstr ""
"\n"
"Въведете съобщение за етикета.\n"
-" %s\n"
+" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
msgstr ""
"\n"
"Въведете съобщение за етикет.\n"
-" %s\n"
+" %s\n"
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
" git tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-tag [-v | --verbose] ПОДАВАНЕ…"
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "извеждане на съдържанието на подаването"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "извеждане на необработения изход от състоянието на „gpg“"
msgid "show statistics only"
msgstr "извеждане само на статистиката"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "неуспешно изтриване на „%s“"
"За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или "
"„remove“"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "целта „%s“ вече съществува"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "не може да изпълни „git status“ върху „%s“"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
"работното дърво „%s“ не е чисто, за принудително изтриване е необходима "
"опцията „--force“ "
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
"наличните\n"
"въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
"за\n"
-"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n"
+"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n"
+"системата за помощ използвайте „git help git“.\n"
"\n"
"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n"
"http://i-can.eu/progit2-bg/progit.html"
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "опцията „--git-dir“ изисква директория\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "опцията „--namespace“ изисква име\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "опцията „--work-tree“ изисква директория\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "опцията „--super-prefix“ изисква префикс\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "опцията „-c“ изисква низ за настройка\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "опцията „-C“ изисква директория\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "непозната опция: „%s“\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "при заместването на псевдоним „%s“: „%s“"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"псевдонимът „%s“ променя променливи на средата.\n"
"За това може да ползвате „!git“ в псевдонима"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "празен псевдоним за „%s“"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "зациклен псевдоним: „%s“"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "грешка при запис на стандартния изход"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "неизвестна грешка при запис на стандартния изход"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"употреба: %s\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"неуспешно заместване на псевдонима „%s“ — резултатът „%s“ не е команда на "
"git\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "командата „%s“ не може да се изпълни: %s\n"
msgid "no-op (backward compatibility)"
msgstr "нулева операция (за съвместимост с предишни версии)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr "повече подробности"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr "по-малко подробности"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
"при възможност преизползване на решението на конфликта за обновяване на "
"индекса"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "Указателят „HEAD“ не е свързан и е при "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Добавяне на съдържанието на файла към индекса"
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr "Ð\90ноÑ\82иÑ\80ане на Ñ\80едовеÑ\82е на Ñ\84айловеÑ\82е Ñ\81 инÑ\84оÑ\80маÑ\86иÑ\8f за подаваниÑ\8fÑ\82а"
+msgstr "Ð\94обавÑ\8fне на инÑ\84оÑ\80маÑ\86иÑ\8f за подаваниÑ\8fÑ\82а кÑ\8aм Ñ\80едовеÑ\82е на Ñ\84айловеÑ\82е"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
msgstr "Привеждане на указателя „HEAD“ към зададеното състояние"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Възстановяване на файловете в работното дърво"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Отменяне на съществуващи подавания"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Извеждане на подаванията в обратна хронологическа подредба"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Избор и промяна на параметри"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Изтриване на файлове от работното дърво и индекса"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Изпращане на поредица от кръпки по е-поща"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Изтласкване на обекти по протокола на Git към друго хранилище"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Ограничена входна обвивка за достъп през SSH само до Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Обобщен изход от „git log“"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Извеждане на различните видове обекти в Git"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Извеждане на клоните и подаванията в тях"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Извеждане на индекса на пакетирания архив"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Извеждане на указателите в локално хранилище"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Настройки на Git за интернационализация на скриптовете на обвивката"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Настройки на Git за скриптовете на обвивката"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Добавяне на съдържанието на файла към индекса"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Преминаване към друг клон"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Уеб интерфейс на Git"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git за потребители на CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Речник с термините на Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Въвеждащ урок за Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
msgid "See git-${cmd}(1) for details."
msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“"
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Автоматично скатаното е приложено."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "„$stash_sha1“ не може да бъде запазен"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Пребазиране ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"Може да променяте последователността на редовете — те се изпълняват\n"
"последователно отгоре-надолу.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: това не е подаване, което може да бъде отбрано"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Неправилно име на подаване: „$sha1“"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
"Заместващата сума по SHA1 за текущото подаване не може да бъде запазена"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Превъртане до „$sha1“"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Не може да се превърти до „$sha1“"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Указателят „HEAD“ не може да се насочи към „$first_parent“"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Подаването не може да се смачка: „$sha1“"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Грешка при повтарянето на сливането на „$sha1“"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "„$sha1“ не може да се отбере."
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Това е съобщение при подаване №${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Съобщение при подаване №${n} ще бъде прескочено."
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Това е обединение от $count подаване."
msgstr[1] "Това е обединение от $count подавания."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Това е обединение от 2 подавания"
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Не може да се подаде $sha1… $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"коригирате,\n"
"преди да можете да промените подаването."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Спиране при „$sha1_abbrev…“ $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Без предходно подаване не може да се изпълни „$squash_style“"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "В момента се изпълнява: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Неуспешно изпълнение: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "и промени индекса и/или работното дърво"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
" git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
" git rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Непозната команда: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Успешно пребазиране и обновяване на „$head_name“."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Не може да бъде открит автор за поправянето на подаването"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Промените в индекса не могат да бъдат подадени."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Текстовият редактор не може да бъде стартиран"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "„$switch_to“ не може да се изтегли"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Липсва указател „HEAD“"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Пребазирането не е интерактивно"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[1] ""
"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
msgstr "Абсолютният път на работното дърво не може да се определи"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%14s %14s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "в индекса"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "извън индекса"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "двоично"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "нищо"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "няма промени"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, 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:612
+#: git-add--interactive.perl:626
#, 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:615
+#: git-add--interactive.perl:629
#, 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:618
+#: git-add--interactive.perl:632
#, 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:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Обновяване"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Отмяна"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Добавяне на неследени"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Няма неследени файлове.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"незабавно\n"
"добавено към индекса"
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"незабавно\n"
"скътано"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"незабавно\n"
"извадено от индекса."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"незабавно\n"
"набелязано за прилагане."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"незабавно\n"
"набелязано за зануляване."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"Редовете, които започват с „%s“ ще бъдат пропуснати.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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"
"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n"
"редактирането — отказано.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
"„n“ (не)? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y — прилагане на парчето към работното дърво\n"
+"n — без прилагане на парчето към работното дърво\n"
+"q — изход, без прилагане на това и всички оставащи парчета\n"
+"a — прилагане на това и всички следващи парчета от файла\n"
+"d — без прилагане на това и всички следващи парчета от файла"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Избраните парчета не могат да се добавят в индекса!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Да се приложат ли към работното дърво? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Нищо не е приложено.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "пренебрегване на неслятото: „%s“\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, 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:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, 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:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, 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:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, 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:1415
+#: git-add--interactive.perl:1451
#, 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:1416
+#: git-add--interactive.perl:1452
#, 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:1417
+#: git-add--interactive.perl:1453
#, 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:1420
+#: git-add--interactive.perl:1456
#, 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:1421
+#: git-add--interactive.perl:1457
#, 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:1422
+#: git-add--interactive.perl:1458
#, 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:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
+"%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Няма други парчета\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "към кое парче да се придвижи? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неправилен номер: „%s“\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Няма други парчета за търсене\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "да се търси с регулярен израз? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Сгрешен регулярен израз „%s“: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Никое парче не напасва на регулярния израз\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Няма друго парче преди това\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Няма друго парче след това\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Това парче не може да бъде разделено\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, 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:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Това парче не може да бъде редактирано\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Преглед на разликата"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
" и индекса\n"
"add untracked — добавяне на неследените файлове към промените в индекса\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "„--“ липсва"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
"текстовият редактор приключи работата с грешка, всичко се преустановява"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"„batch-size“ и „relogin“ трябва да се указват заедно (или чрез командния "
"ред, или чрез настройките)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Непозната стойност за „--confirm“: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: псевдоними за sendmail съдържащи кавички („\"“) не се "
"поддържат: %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" ● укажете „./%s“ за файл;\n"
" ● използвате опцията „--format-patch“ за диапазон.\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Директорията „%s“ не може да се отвори: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"ФАТАЛНА ГРЕШКА: %s: %s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"Не са указани кръпки!\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "В „%s“ липсва тема"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "„%s“ не може да се отвори за запис: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "„%s“ не може да се отвори: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "„%s.final“ не може да се отвори: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Обобщаващото писмо е празно и се прескача\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
"Transfer-Encoding“.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "На кой да се пратят е-писмата (незадължително поле)"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ е псевдоним на себе си\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
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:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
"„e“ (редактиране): "
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Пътят към сертификат „%s“ не съществува."
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Изпращане на е-писмото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
"„a“ (всичко): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Изискване на отговор към това е-писмо"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Сървърът за SMTP не е настроен правилно."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сървърът не поддържа „STARTTLS“! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Неуспешно изпълнение на STARTTLS! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
"използвайте опцията: „--smtp-debug“."
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "„%s“ не може да бъде изпратен\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Проба за изпращане на „%s“\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Изпращане на „%s“\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Успех при пробата. От журнала:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "Успех. От журнала:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Резултат: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "„%s“: кръпката съдържа ред с над 988 знака"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, 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:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Наистина ли искате да изпратите „%s“? [y|N]: "
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-02-15 10:09+0800\n"
-"PO-Revision-Date: 2019-03-21 15:24+0100\n"
+"POT-Creation-Date: 2019-07-30 09:59+0800\n"
+"PO-Revision-Date: 2019-07-30 08:23+0200\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
-#: advice.c:101
-#, fuzzy, c-format
+#: advice.c:109
+#, c-format
msgid "%shint: %.*s%s\n"
-msgstr "pista: %.*s\n"
+msgstr "%spista: %.*s%s\n"
-#: advice.c:154
+#: advice.c:162
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:156
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:158
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:160
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:162
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:164
+#: advice.c:172
#, 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:172
+#: advice.c:180
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."
"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
"resolució i feu una comissió."
-#: advice.c:180
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:185 builtin/merge.c:1290
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:187
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
-#: advice.c:188
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
-#: advice.c:194
-#, c-format
+#: advice.c:202
+#, fuzzy, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
"Avís: s'està agafant «%s».\n"
msgid "unclosed quote"
msgstr ""
-#: apply.c:59
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opció d'espai en blanc «%s» no reconeguda"
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way no es poden usar junts."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached i --3way no es poden usar junts."
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: apply.c:825
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: apply.c:834
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: apply.c:908
+#: apply.c:884
#, 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:946
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la línia %d"
+msgstr ""
+"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
+"línia %d"
-#: apply.c:952
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d"
+msgstr ""
+"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia "
+"%d"
-#: apply.c:953
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d"
+msgstr ""
+"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la "
+"línia %d"
-#: apply.c:958
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
-#: apply.c:987
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode no vàlid en la línia %d: %s"
-#: apply.c:1306
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "línies de capçalera %d i %d inconsistents"
-#: apply.c:1478
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: apply.c:1547
+#: apply.c:1529
#, 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:1567
+#: apply.c:1551
#, c-format
-msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)"
-msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)"
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
msgstr[0] ""
-"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:1580
+#: apply.c:1564
#, 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:1768
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: apply.c:1770
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: apply.c:1804
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
-#: apply.c:1841
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: apply.c:1843
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: apply.c:1846
+#: apply.c:1830
#, 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:1993
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2030
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2192
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2278
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2282
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2941
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: «%c»"
-#: apply.c:3062
+#: apply.c:3046
#, 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:3074
+#: apply.c:3058
#, 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:3080
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"tot cercant:\n"
"%.*s"
-#: apply.c:3102
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3110
+#: apply.c:3094
#, 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:3157
+#: apply.c:3141
#, 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:3167
+#: apply.c:3151
#, 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:3175
+#: apply.c:3159
#, 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:3193
+#: apply.c:3177
#, 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:3206
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3212
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)"
+msgstr ""
+"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
+"rebut %s)"
-#: apply.c:3233
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3356
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3416
+#: 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:3445 apply.c:3688
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3531 apply.c:3703
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3540 apply.c:3711
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3575
+#: apply.c:3559
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:3578
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
-#: apply.c:3594 apply.c:3598
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3610
+#: apply.c:3594
#, 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:3624
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
-#: apply.c:3629
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3655
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3728
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3730
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 read-cache.c:1299
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "camí no vàlid: «%s»"
-#: apply.c:3939
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3942
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3962
+#: apply.c:3946
#, 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:3967
+#: apply.c:3951
#, 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:3987
+#: apply.c:3971
#, 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:3991
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:4006
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4098
+#: apply.c:4082
#, 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:4105
+#: apply.c:4089
#, 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 la HEAD actual"
-#: apply.c:4108
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: apply.c:4117
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4127
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4265
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4299
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4305
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4313
+#: apply.c:4297
#, 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:4319 apply.c:4464
+#: apply.c:4303 apply.c:4448
#, 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:4362
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4366
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4436
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4534
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4542
+#: apply.c:4526
msgid "internal error"
msgstr "error intern"
-#: apply.c:4545
+#: apply.c:4529
#, 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:4556
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4578
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4582
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4692
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4700
+#: apply.c:4684
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4720
+#: apply.c:4704
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4875
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4902
+#: apply.c:4886
#, 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:4908 apply.c:4923
+#: apply.c:4892 apply.c:4907
#, 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:4916
+#: apply.c:4900
#, 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:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 builtin/clone.c:122 builtin/fetch.c:118
-#: builtin/merge.c:263 builtin/pull.c:200 builtin/submodule--helper.c:407 builtin/submodule--helper.c:1366
-#: builtin/submodule--helper.c:1369 builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "camí"
-#: apply.c:4960
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4963
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4965 builtin/am.c:2212
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "número"
-#: apply.c:4966
+#: apply.c:4950
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:4969
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4971
+#: apply.c:4955
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:4975
+#: apply.c:4959
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:4977
+#: apply.c:4961
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:4979
+#: apply.c:4963
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:4981
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4983
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4985
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4987
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4990
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4992
+#: apply.c:4976
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:4994
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:4999
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/interpret-trailers.c:101 builtin/pack-objects.c:3314 builtin/rebase.c:1065
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
msgid "action"
msgstr "acció"
-#: apply.c:5001
+#: apply.c:4985
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:5004 apply.c:5007
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:5010
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:5012
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:5014
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:5016
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 builtin/commit.c:1312 builtin/count-objects.c:98
-#: builtin/fsck.c:724 builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 builtin/rebase--interactive.c:159
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:5019
+#: apply.c:5003
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:5022
+#: apply.c:5006
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:5024 builtin/am.c:2200
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "arrel"
-#: apply.c:5025
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
msgstr "git archive --list"
#: archive.c:16
-msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> [<camí>...]"
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
+"[<camí>...]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
msgid "not a tree object: %s"
msgstr "no és un objecte d'arbre: %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "no es segueix el directori de treball actual"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "format"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:456 builtin/log.c:1549
+#: archive.c:458 builtin/log.c:1597
msgid "prefix"
msgstr "prefix"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 builtin/ls-files.c:560
-#: builtin/ls-files.c:563 builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:162
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fitxer"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "comprimeix més ràpidament"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 builtin/submodule--helper.c:1378
-#: builtin/submodule--helper.c:1859
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "dipòsit"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715 builtin/notes.c:498
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "ordre"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "L'opció --exec només es pot usar juntament amb --remote"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Paràmetre no admès per al format «%s»: -%d"
msgid "cannot read %s"
msgstr "no es pot llegir «%s»"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "no s'ha pogut iniciar el filtre «%s»"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "no s'ha pogut redirigir el descriptor"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "«%s» error reportat pel filtre"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "marca de temps massa
llarga per a aquest sistema: %<PRIuMAX>"
+msgstr "marca de temps massa
gran per a aquest sistema: %<PRIuMAX>"
#: attr.c:211
#, c-format
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
+"%s.\n"
"Continuem de totes maneres."
#: bisect.c:822
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:937 builtin/merge.c:139
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:967
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:986
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:994
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí incorrectes?\n"
-#: bisect.c:1013
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1019
+#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "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:1792
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
-#: blame.c:1806
+#: blame.c:2711
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:1827
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "--reverse i --first-parent-together requereixen una última comissió especificada"
+msgstr ""
+"--reverse i --first-parent-together requereixen una última comissió "
+"especificada"
-#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 sequencer.c:4064 builtin/commit.c:1004
-#: builtin/log.c:378 builtin/log.c:936 builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
-#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 builtin/shortlog.c:192
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
+#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
-#: blame.c:1854
-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:2759
+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:1865
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "no hi ha tal camí %s en %s"
-#: blame.c:1876
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no es pot llegir el blob %s per al camí %s"
-#: branch.c:52
+#: branch.c:53
#, c-format
msgid ""
"\n"
"intentar corregir la informació de seguiment remot\n"
"invocant \"git branch --set-upstream-to=%s%s%s\"."
-#: branch.c:66
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "No s'està establint la branca %s com a la seva pròpia font."
-#: branch.c:92
+#: 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» fent «rebase»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» "
+"fent «rebase»."
-#: branch.c:93
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
-#: branch.c:97
+#: 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» fent «rebase»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca local «%s» fent "
+"«rebase»."
-#: branch.c:98
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
-#: branch.c:103
+#: 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» fent «rebase»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
+"«rebase»."
-#: branch.c:104
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "La branca «%s» està configurada per a seguir la referència remota «%s»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència remota «%s»."
-#: branch.c:108
+#: 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» fent «rebase»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència local «%s» fent "
+"«rebase»."
-#: branch.c:109
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
-#: branch.c:118
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "No es pot escriure la configuració de la branca font"
-#: branch.c:155
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "No seguint: informació ambigua per a la referència %s"
-#: branch.c:188
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» no és un nom de branca vàlid."
-#: branch.c:207
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Una branca amb nom «%s» ja existeix."
-#: branch.c:212
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:232
+#: branch.c:233
#, 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:234
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branca font demanada «%s» no existeix"
-#: branch.c:236
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"«git push -u» per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:280
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "No és un nom d'objecte vàlid: «%s»."
-#: branch.c:300
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objecte ambigu: «%s»."
-#: branch.c:305
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "No és un punt de ramificació vàlid: «%s»."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» ja s'ha agafat a «%s»"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD de l'arbre de treball %s no està actualitzat"
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763 builtin/commit.c:776
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "no s'ha pogut obrir «%s»"
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "cal un dipòsit per verificar un farcell"
+
+#: bundle.c:197
#, 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:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:203
+#: bundle.c:206
#, 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:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "no s'ha pogut duplicar el descriptor del farcell"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:378
+#: bundle.c:381
#, 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:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 builtin/am.c:1375 builtin/am.c:2019
-#: builtin/replace.c:376 builtin/replace.c:448
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1122
+#: commit.c:1127
#, 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."
-#: commit.c:1125
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
-#: commit.c:1128
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: commit.c:1131
+#: commit.c:1136
#, 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"
-#: commit.c:1385
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"la variable de configuració i18n.commitencoding a la codificació que\n"
"usi el vostre projecte.\n"
-#: commit-graph.c:101
-#, c-format
-msgid "graph file %s is too small"
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:136
+#: commit-graph.c:192
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr ""
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X"
-#: commit-graph.c:143
-#, fuzzy, c-format
-msgid "graph version %X does not match version %X"
-msgstr "el camí «%s» no té la seva versió"
+#: commit-graph.c:199
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
-#: commit-graph.c:150
-#, fuzzy, c-format
-msgid "hash version %X does not match version %X"
-msgstr "el camí «%s» no té la seva versió"
+#: commit-graph.c:206
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X"
+
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr ""
-#: commit-graph.c:173
-msgid "chunk lookup table entry missing; graph file may be incomplete"
+#: commit-graph.c:240
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:184
+#: commit-graph.c:283
#, c-format
-msgid "improper chunk offset %08x%08x"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
msgstr ""
-#: commit-graph.c:221
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la cadena del graf de comissions no coincideix"
+
+#: commit-graph.c:404
#, c-format
-msgid "chunk id %08x appears multiple times"
+msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
-#: commit-graph.c:334
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "no es poden trobar tots els fitxers del graf de comissions"
+
+#: commit-graph.c:553 commit-graph.c:613
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posició de la comissió no vàlida. Probablement el graf de comissions està malmès"
+
+#: commit-graph.c:574
#, c-format
msgid "could not find commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: commit-graph.c:671 builtin/pack-objects.c:2646
+#: commit-graph.c:1001 builtin/pack-objects.c:2651
#, c-format
msgid "unable to get type of object %s"
msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-#: commit-graph.c:704
+#: commit-graph.c:1033
msgid "Loading known commits in commit graph"
msgstr "S'estan carregant comissions conegudes al graf de comissions"
-#: commit-graph.c:720
+#: commit-graph.c:1050
msgid "Expanding reachable commits in commit graph"
msgstr "S'estan expandint les comissions abastables al graf de comissions"
-#: commit-graph.c:732
+#: commit-graph.c:1069
msgid "Clearing commit marks in commit graph"
msgstr "S'estan netejant les marques de comissions al graf de comissions"
-#: commit-graph.c:752
+#: commit-graph.c:1088
msgid "Computing commit graph generation numbers"
-msgstr ""
+msgstr "S'estan calculant els nombres de generació del graf de comissions"
-#: commit-graph.c:869
-#, fuzzy, c-format
+#: commit-graph.c:1162
+#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "masses comissions per escriure un graf"
-msgstr[1] "masses comissions per escriure un graf"
+msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
+msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
-#: commit-graph.c:882
+#: commit-graph.c:1175
#, c-format
msgid "error adding pack %s"
msgstr "error en afegir paquet %s"
-#: commit-graph.c:884
+#: commit-graph.c:1179
#, c-format
msgid "error opening index for %s"
msgstr "s'ha produït un error en obrir l'índex per «%s»"
-#: commit-graph.c:898
-#, fuzzy, c-format
+#: commit-graph.c:1203
+#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "masses comissions per escriure un graf"
-msgstr[1] "masses comissions per escriure un graf"
+msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència"
+msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències"
-#: commit-graph.c:930
-#, fuzzy
+#: commit-graph.c:1237
msgid "Finding commits for commit graph among packed objects"
-msgstr "masses comissions per escriure un graf"
+msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats"
-#: commit-graph.c:943
-#, fuzzy
+#: commit-graph.c:1252
msgid "Counting distinct commits in commit graph"
-msgstr "masses comissions per escriure un graf"
-
-#: commit-graph.c:956
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
+msgstr "S'estant comptant les comissions diferents al graf de comissions"
-#: commit-graph.c:965
-#, fuzzy
+#: commit-graph.c:1283
msgid "Finding extra edges in commit graph"
-msgstr "masses comissions per escriure un graf"
+msgstr "S'estan cercant les vores addicionals al graf de comissions"
-#: commit-graph.c:989
-msgid "too many commits to write graph"
-msgstr "masses comissions per escriure un graf"
+#: commit-graph.c:1331
+msgid "failed to write correct number of base graph ids"
+msgstr "s'ha produït un error en escriure el nombre correcte d'ids base del graf"
-#: commit-graph.c:996 midx.c:769
+#: commit-graph.c:1364 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: commit-graph.c:1036
+#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: commit-graph.c:1436
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "S'està escrivint el graf de comissions en %d pas"
msgstr[1] "S'està escrivint el graf de comissions en %d passos"
-#: commit-graph.c:1109
+#: commit-graph.c:1477
+msgid "unable to open commit-graph chain file"
+msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
+
+#: commit-graph.c:1489
+msgid "failed to rename base commit-graph file"
+msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
+
+#: commit-graph.c:1509
+msgid "failed to rename temporary commit-graph file"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+
+#: commit-graph.c:1620
+msgid "Scanning merged commits"
+msgstr "S'estan escanejant les comissions fusionades"
+
+#: commit-graph.c:1631
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de comissió duplicat %s no esperat"
+
+#: commit-graph.c:1656
+msgid "Merging commit-graph"
+msgstr "S'està fusionant el graf de comissions"
+
+#: commit-graph.c:1842
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "el format del graf de comissions no pot escriure %d comissions"
+
+#: commit-graph.c:1853
+msgid "too many commits to write graph"
+msgstr "massa comissions per escriure un graf"
+
+#: commit-graph.c:1943
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "el fitxer commit-graph (graf de comissions) té una suma de verificació incorrecta i probablement és corrupte"
+msgstr ""
+"el fitxer commit-graph (graf de comissions) té una suma de verificació "
+"incorrecta i probablement és corrupte"
+
+#: commit-graph.c:1953
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
-#: commit-graph.c:1153
+#: commit-graph.c:1963 commit-graph.c:1978
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:1970
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "s'ha produït un error en analitzar la comissió %s del graf de comissions"
+
+#: commit-graph.c:1987
msgid "Verifying commits in commit graph"
-msgstr "S'estan verificant les comissions al graf de comssions"
+msgstr "S'estan verificant les comissions al graf de comissions"
+
+#: commit-graph.c:2000
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2007
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2017
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2026
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2039
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2044
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2048
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2063
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2069
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "les inclusions de configuració relatives han de venir de fitxers"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
-msgstr "els condicionals d'inclusió de configuració relatius han de venir de fitxers"
+msgstr ""
+"els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-#: config.c:348
+#: config.c:375
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
-#: config.c:354
+#: config.c:381
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clau no conté un nom de variable: «%s»"
-#: config.c:378 sequencer.c:2330
+#: config.c:405 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: config.c:384
+#: config.c:411
#, c-format
msgid "invalid key (newline): %s"
msgstr "clau no vàlida (línea nova): %s"
-#: config.c:420 config.c:432
+#: config.c:447 config.c:459
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
-#: config.c:467
+#: config.c:494
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
-#: config.c:793
+#: config.c:820
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:797
+#: config.c:824
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:801
+#: config.c:828
#, 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:805
+#: config.c:832
#, 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:809
+#: config.c:836
#, 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:813
+#: config.c:840
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:952
+#: config.c:977
msgid "out of range"
msgstr "fora de rang"
-#: config.c:952
+#: config.c:977
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:958
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:963
+#: config.c:997
#, 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:966
+#: config.c:1000
#, 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:969
+#: config.c:1003
#, 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:972
+#: config.c:1006
#, 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:975
+#: config.c:1009
#, 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:978
+#: config.c:1012
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
-#: config.c:1073
+#: config.c:1107
#, 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:1082
+#: config.c:1116
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» per a «%s» no és una marca de temps vàlida"
-#: config.c:1173
+#: config.c:1207
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1221 config.c:1232
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1290
+#: config.c:1324
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1357
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1395
+#: config.c:1429
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
-#: config.c:1421
+#: config.c:1455
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: config.c:1422
+#: config.c:1456
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1481 builtin/pack-objects.c:3394
+#: config.c:1517 builtin/pack-objects.c:3399
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
-#: config.c:1602
+#: config.c:1638
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
-#: config.c:1605
+#: config.c:1641
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la referència «%s» no assenyala a un blob"
-#: config.c:1622
+#: config.c:1658
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
-#: config.c:1652
+#: config.c:1688
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
-#: config.c:1705
+#: config.c:1744
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:2037
+#: config.c:2093
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2207
+#: config.c:2263
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
-#: config.c:2250
+#: config.c:2306
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte «keep»"
+msgstr ""
+"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte "
+"«keep»"
-#: config.c:2276
+#: config.c:2332
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
-#: config.c:2322
+#: config.c:2378
#, 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:2324
+#: config.c:2380
#, 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:2405
+#: config.c:2461
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
-#: config.c:2437
+#: config.c:2493
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2466
+#: config.c:2522
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
-#: config.c:2716 config.c:3040
+#: config.c:2774 config.c:3098
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-#: config.c:2727
+#: config.c:2785
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
-#: config.c:2762 builtin/config.c:328
+#: config.c:2820 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
-#: config.c:2787
+#: config.c:2845
#, c-format
msgid "invalid config file %s"
msgstr "fitxer de configuració no vàlid %s"
-#: config.c:2800 config.c:3053
+#: config.c:2858 config.c:3111
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat «fstat» a %s"
-#: config.c:2811
+#: config.c:2869
#, c-format
msgid "unable to mmap '%s'"
msgstr "no s'ha pogut fer «mmap» «%s»"
-#: config.c:2820 config.c:3058
+#: config.c:2878 config.c:3116
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
-#: config.c:2905 config.c:3155
+#: config.c:2963 config.c:3213
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-#: config.c:2939
+#: config.c:2997
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:2941 builtin/remote.c:782
+#: config.c:2999 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
-#: config.c:3031
+#: config.c:3089
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
-#: config.c:3198
+#: config.c:3256
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
#: connect.c:273
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
+msgstr ""
+"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
#: connect.c:275
msgid "repository on the other end cannot be shallow"
msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
#: connect.c:441
-#, fuzzy, c-format
+#, c-format
msgid "invalid ls-refs response: %s"
-msgstr "referència no vàlida: %s"
+msgstr "resposta de ls-refs no vàlida: %s"
#: connect.c:445
msgid "expected flush after ref listing"
#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
-msgstr "s'ha bloquejat el nom extrany d'amfitrió «%s»"
+msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
-msgstr "s'ha bloquejat el port extrany «%s»"
+msgstr "s'ha bloquejat el port estrany «%s»"
#: connect.c:857
#, c-format
#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
+msgstr "no s'ha especificat un camí; vegeu «git help pull» per la sintaxis vàlida per URL"
#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variant «simple» d'ssh no permet definir el port"
-#: connect.c:1259
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "s'ha bloquejat el nom de fitxer extrany «%s»"
-#: connect.c:1304
+#: connect.c:1307
msgid "unable to fork"
msgstr "no s'ha pogut bifurcar"
-#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
"The file will have its original line endings in your working directory"
msgstr ""
"CRLF serà reemplaçat per 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:216
#, c-format
"The file will have its original line endings in your working directory"
msgstr ""
"LF serà reemplaçat per 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:279
#, c-format
#: convert.c:286
#, c-format
-msgid "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-tree-encoding."
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
#: convert.c:304
#: convert.c:306
#, c-format
msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-%sLE (depending on the byte order) as "
-"working-tree-encoding."
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
#: convert.c:424 convert.c:495
#: convert.c:929
#, c-format
-msgid "external filter '%s' is not available anymore although not all paths have been filtered"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
#: convert.c:1228
msgstr ""
#: convert.c:1398 convert.c:1432
-#, fuzzy, c-format
+#, c-format
msgid "%s: clean filter '%s' failed"
-msgstr "la creació de «%s» ha fallat"
+msgstr "%s: el filtre de netejat «%s» ha fallat"
#: convert.c:1476
#, fuzzy, c-format
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
-msgstr "s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
+msgstr ""
+"s'ha produït un error en carregar l'expressió regular de l'illa per «%s»: %s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "l'expressió regular de l'illa des de la configuració té massa grups de captura (màx=%d)"
+msgstr ""
+"l'expressió regular de l'illa des de la configuració té massa grups de "
+"captura (màx=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Marcades %d illes, fet.\n"
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "l'opció «%s» requereix un valor"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opcions>] <camí> <camí>"
-#: diff.c:158
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del "
+"directori de treball"
+
+
+#: diff.c:155
#, 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:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paràmetre de dirstat desconegut «%s»\n"
-#: diff.c:291
-msgid "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
-msgstr "el paràmetre de color en moviment ha de ser «no», «default», «blocks», «zebra», «dimmed-zebra» o «plain»"
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
+"«zebra», «dimmed-zebra» o «plain»"
-#: diff.c:319
+#: diff.c:324
#, c-format
msgid ""
-"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-"
-"space', 'allow-indentation-change'"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:327
-msgid "color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: diff.c:400
+#: diff.c:405
#, 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:460
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:4211
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:4553
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
-#: diff.c:4556
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S and --find-object són mútuament excloents"
-#: diff.c:4634
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:4800
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor --stat no vàlid: %s"
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numèric"
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:4814
-#, 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»"
-
-#: diff.c:5900
-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:5903
-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."
-
-#: diff.c:5906
+#: diff.c:4811
#, 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 "unknown change class '%c' in --diff-filter=%s"
+msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
-#: dir.c:538
+#: diff.c:4835
#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "valor desconegut després de ws-error-highlight=%.*s"
-#: dir.c:927
+#: diff.c:4849
#, c-format
-msgid "cannot use %s as an exclude file"
-msgstr "no es pot usar %s com a fitxer d'exclusió"
+msgid "unable to resolve '%s'"
+msgstr "no s'ha pogut resoldre «%s»"
-#: dir.c:1842
+#: diff.c:4899 diff.c:4905
#, c-format
-msgid "could not open directory '%s'"
-msgstr "no s'ha pogut obrir el directori «%s»"
-
-#: dir.c:2084
-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:2208
-msgid "untracked cache is disabled on this system or location"
-msgstr "la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
+msgid "%s expects <n>/<m> form"
+msgstr ""
-#: dir.c:3009
+#: diff.c:4917
#, c-format
-msgid "index file corrupt in repo %s"
-msgstr "el fitxer d'índex al dipòsit %s és malmès"
+msgid "%s expects a character, got '%s'"
+msgstr "%s esperava un caràcter, s'ha rebut «%s»"
-#: dir.c:3054 dir.c:3059
+#: diff.c:4938
#, c-format
-msgid "could not create directories for %s"
-msgstr "no s'han pogut crear directoris per %s"
+msgid "bad --color-moved argument: %s"
+msgstr "paràmetre --color-moved incorrecte: %s"
-#: dir.c:3088
+#: diff.c:4957
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode «%s» no vàlid en -color-moved-ws"
-#: editor.c:73
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
msgstr ""
+"l'opció diff-algorithm accepta «myers», «minimalminimal», \"patience\" and "
+"«histogram»"
-#: entry.c:178
-msgid "Filtering content"
-msgstr "S'està filtrant el contingut"
-
-#: entry.c:465
+#: diff.c:5033 diff.c:5053
#, c-format
-msgid "could not stat file '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
+msgid "invalid argument to %s"
+msgstr "argument no vàlid a %s"
-#: environment.c:150
+#: diff.c:5191
#, c-format
-msgid "bad git namespace path \"%s\""
+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»"
-#: environment.c:332
+#: diff.c:5247
#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no s'ha pogut establir GIT_DIR a «%s»"
+msgid "bad --word-diff argument: %s"
+msgstr "paràmetre --word-diff incorrecte: %s"
-#: exec-cmd.c:361
-#, c-format
-msgid "too many args to run %s"
-msgstr "hi ha massa arguments per a executar %s"
+#: diff.c:5270
+msgid "Diff output format options"
+msgstr "Opcions del format de sortida del diff"
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remot sense URL"
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
+msgstr "generant pedaç"
-#: fetch-pack.c:151
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: llista superficial esperada"
+#: diff.c:5275 builtin/log.c:182
+msgid "suppress diff output"
+msgstr "omet la sortida de diferències"
-#: fetch-pack.c:154
-#, fuzzy
-msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: llista superficial esperada"
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
+msgstr "<n>"
-#: fetch-pack.c:165
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
+msgstr "genera diffs amb <n> línies de context"
+
+#: diff.c:5286
+msgid "generate the diff in raw format"
+msgstr "genera el diff en format cru"
+
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
+msgstr "sinònim de per a «-p --raw»"
+
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
+msgstr "sinònim de per a «-p --stat»"
+
+#: diff.c:5297
+msgid "machine friendly --stat"
+msgstr "llegible per màquina --stat"
+
+#: diff.c:5300
+msgid "output only the last line of --stat"
+msgstr "mostra només l'última línia de --stat"
+
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinònim per -dirstat=cumulative"
+
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinònim per --dirstat=files,param1,param2..."
+
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5321
+msgid "show only names of changed files"
+msgstr "mostra només els noms de fitxers canviats"
+
+#: diff.c:5324
+msgid "show only names and status of changed files"
+msgstr "mostra només els noms i l'estat dels fitxers canviats"
+
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5327
+msgid "generate diffstat"
+msgstr "genera diffstat"
+
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
+msgstr "<amplada>"
+
+#: diff.c:5330
+msgid "generate diffstat with a given width"
+msgstr "genera diffstat amb una amplada donada"
+
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
+msgstr "genera diffstat amb un nom d'amplada donat"
+
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
+msgstr "genera diffstat amb una amplada de graf donada"
+
+#: diff.c:5338
+msgid "<count>"
+msgstr "<comptador>"
+
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
+msgstr "genera diffstat amb línies limitades"
+
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
+msgstr "genera un resum compacte a diffstat"
+
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
+msgstr "diff amb sortida binaria que pot ser aplicada"
+
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5350
+msgid "show colored diff"
+msgstr "mostra un diff amb colors"
+
+#: diff.c:5351
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
+msgstr "<prefix>"
+
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
+msgstr "afegir un prefix addicional per a cada línia de sortida"
+
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
+msgstr "no mostris cap prefix d'origen o destí"
+
+#: diff.c:5371
+#, fuzzy
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
+
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
+msgstr "<char>"
+
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
+
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
+
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
+
+#: diff.c:5389
+msgid "Diff rename options"
+msgstr "Opcions de canvi de nom del diff"
+
+#: diff.c:5390
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear"
+
+#: diff.c:5395
+msgid "detect renames"
+msgstr "detecta els canvis de noms"
+
+#: diff.c:5399
+msgid "omit the preimage for deletes"
+msgstr "omet les preimatges per les supressions"
+
+#: diff.c:5402
+msgid "detect copies"
+msgstr "detecta còpies"
+
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
+msgstr "usa els fitxers no modificats com a font per trobar còpies"
+
+#: diff.c:5408
+msgid "disable rename detection"
+msgstr "inhabilita la detecció de canvis de nom"
+
+#: diff.c:5411
+msgid "use empty blobs as rename source"
+msgstr "usa els blobs buits com a font de canvi de nom"
+
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
+msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom"
+
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5418
+msgid "Diff algorithm options"
+msgstr "Opcions d'algorisme Diff"
+
+#: diff.c:5420
+msgid "produce the smallest possible diff"
+msgstr "produeix el diff més petit possible"
+
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
+msgstr "ignora els espai en blanc en comparar línies"
+
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
+msgstr "ignora els canvis en la quantitat d'espai en blanc"
+
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignora els canvis d'espai en blanc al final de la línia"
+
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
+msgstr "ignora els retorns de línia al final de la línia"
+
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
+msgstr "ignora els canvis en línies que estan en blanc"
+
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera diff usant l'algorisme «patience diff»"
+
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera diff usant l'algorisme «histogram diff»"
+
+#: diff.c:5447
+msgid "<algorithm>"
+msgstr "<algorisme>"
+
+#: diff.c:5448
+msgid "choose a diff algorithm"
+msgstr "escolliu un algorisme pel diff"
+
+#: diff.c:5450
+msgid "<text>"
+msgstr "<text>"
+
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera diff usant l'algorisme «anchored diff»"
+
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5469
+#, fuzzy
+msgid "Other diff options"
+msgstr "Opcions genèriques"
+
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5475
+msgid "treat all files as text"
+msgstr "tracta tots els fitxers com a text"
+
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
+
+#: diff.c:5481
+msgid "disable all output of the program"
+msgstr "inhabilita totes les sortides del programa"
+
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5487
+msgid "<when>"
+msgstr "<quan>"
+
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignora els canvis als submòduls en la generació del diff"
+
+#: diff.c:5491
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
+msgstr "especifiqueu com es mostren els canvis als submòduls"
+
+#: diff.c:5496
+#, fuzzy
+msgid "hide 'git add -N' entries from the index"
+msgstr "usa .gitattributes només des de l'índex"
+
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5501
+msgid "<string>"
+msgstr "<cadena>"
+
+#: diff.c:5502
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5508
+#, fuzzy
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostra els fitxers coincidents en el paginador"
+
+#: diff.c:5511
+#, fuzzy
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "usa les expressions regulars POSIX ampliades"
+
+#: diff.c:5514
+#, fuzzy
+msgid "control the order in which files appear in the output"
+msgstr "mostra en la sortida els altres fitxers"
+
+#: diff.c:5515
+#, fuzzy
+msgid "<object-id>"
+msgstr "objecte"
+
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5519
+msgid "select files by diff type"
+msgstr "seleccioneu els fitxer per tipus de diff"
+
+#: diff.c:5521
+msgid "<file>"
+msgstr "<fitxer>"
+
+#: diff.c:5522
+msgid "Output to a specific file"
+msgstr "Sortida a un fitxer específic"
+
+#: diff.c:6177
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
+
+#: diff.c:6180
+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."
+
+#: diff.c:6183
+#, 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."
+
+#: dir.c:537
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+"l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
+
+#: dir.c:926
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
+
+#: dir.c:1843
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "no s'ha pogut obrir el directori «%s»"
+
+#: dir.c:2085
+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:2209
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+"la memòria cau no seguida està inhabilitada en aquest sistema o ubicació"
+
+#: dir.c:3013
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "el fitxer d'índex al dipòsit %s és malmès"
+
+#: dir.c:3058 dir.c:3063
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no s'han pogut crear directoris per %s"
+
+#: dir.c:3092
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
+
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:178
+msgid "Filtering content"
+msgstr "S'està filtrant el contingut"
+
+#: entry.c:476
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
+
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "no s'ha pogut establir GIT_DIR a «%s»"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr "hi ha massa arguments per a executar %s"
+
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Remot sense URL"
+
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: llista superficial esperada"
+
+#: fetch-pack.c:154
+#, fuzzy
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: llista superficial esperada"
+
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:256
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr "no s'ha pogut escriure al remot"
+
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:358 fetch-pack.c:1264
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:364 fetch-pack.c:1271
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:366 fetch-pack.c:1273
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:369 fetch-pack.c:1276
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:371 fetch-pack.c:1278
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:374 fetch-pack.c:1282
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:415
+#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:463
+#: fetch-pack.c:465
msgid "giving up"
-msgstr "s'està rendint"
+msgstr "s'abandona"
-#: fetch-pack.c:475 progress.c:229
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fet"
-#: fetch-pack.c:487
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:740
+#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:779
+#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:787
+#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:855
+#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:871
+#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:873
+#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:902
-msgid "Server does not support shallow clients"
-msgstr "El servidor no permet clients superficials"
-
-#: fetch-pack.c:906
-msgid "Server supports multi_ack_detailed"
-msgstr "El servidor accepta multi_ack_detailed"
-
-#: fetch-pack.c:909
-msgid "Server supports no-done"
-msgstr "El servidor accepta no-done"
-
-#: fetch-pack.c:915
-msgid "Server supports multi_ack"
-msgstr "El servidor accepta multi_ack"
-
-#: fetch-pack.c:919
-msgid "Server supports side-band-64k"
-msgstr "El servidor accepta side-band-64k"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band"
-msgstr "El servidor accepta banda lateral"
-
-#: fetch-pack.c:927
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "El servidor accepta allow-tip-sha1-in-want"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "El servidor accepta allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:941
-msgid "Server supports ofs-delta"
-msgstr "El servidor accepta ofs-delta"
-
-#: fetch-pack.c:947 fetch-pack.c:1140
-msgid "Server supports filter"
-msgstr "El servidor accepta filtre"
-
-#: fetch-pack.c:955
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:961
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor accepta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "El servidor no permet clients superficials"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:965
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:967
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:984
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:996 fetch-pack.c:1419
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1134
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "El servidor no permet peticions superficials"
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "El servidor accepta filtratge"
+
#: fetch-pack.c:1184
+msgid "unable to write request to remote"
+msgstr "no s'ha pogut escriure la petició al remot"
+
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
-#: fetch-pack.c:1229
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "línia de confirmació inesperada: «%s»"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1252
#, fuzzy, c-format
msgid "error processing acks: %d"
msgstr "error en llegir %s"
-#: fetch-pack.c:1244
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+msgstr "s'espera l'enviament del fitxer de paquet després de «ready»"
-#: fetch-pack.c:1246
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
-msgstr ""
+msgstr "s'espera que cap altra seccions s'enviï després de no «ready»"
-#: fetch-pack.c:1287
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "s'ha produït un error en processar la informació superficial: %d"
-#: fetch-pack.c:1308
-#, fuzzy, c-format
+#: fetch-pack.c:1353
+#, c-format
msgid "expected wanted-ref, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-#: fetch-pack.c:1318
-#, fuzzy, c-format
+#: fetch-pack.c:1358
+#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr "final de fitxer inesperat"
+msgstr "wanted-ref inesperat: «%s»"
-#: fetch-pack.c:1322
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "s'ha produït un error en processar les referències desitjades: %d"
-#: fetch-pack.c:1646
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1664 builtin/clone.c:671
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: fetch-pack.c:1690
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:1693
+#: fetch-pack.c:1742
#, 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:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 builtin/rm.c:135
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
#: help.c:35
msgid "Low-level Commands / Manipulators"
-msgstr ""
+msgstr "Ordres de baix nivell / Manipuladors"
#: help.c:36
msgid "Low-level Commands / Interrogators"
-msgstr ""
+msgstr "Ordres de baix nivell / Interrogadors"
#: help.c:37
msgid "Low-level Commands / Synching Repositories"
-msgstr ""
+msgstr "Ordres de baix nivell / Sincronització de dipòsits"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
-msgstr ""
+msgstr "Ordres de baix nivell / Ajudants interns"
#: help.c:298
#, c-format
#: help.c:314
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:363 git.c:90
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipus de llistat de l'ordre no compatible «%s»"
-#: help.c:410
+#: help.c:403
msgid "The common Git guides are:"
msgstr "Les guies de Git comunes són:"
-#: help.c:519
+#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr ""
+msgstr "Vegeu «git help <ordre>» per llegir sobre un subordre específic"
-#: help.c:524
+#: help.c:517
msgid "External commands"
msgstr "Ordres externes"
-#: help.c:539
+#: help.c:532
msgid "Command aliases"
msgstr "Àlies d'ordres"
-#: help.c:603
+#: help.c:596
#, 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» sembla una ordre de git, però no hem pogut\n"
+"«%s» sembla un ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
-#: help.c:662
+#: help.c:655
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:684
+#: help.c:677
#, 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."
+msgstr ""
+"ADVERTÈNCIA: Heu invocat un ordre de Git amb nom «%s», la qual no existeix."
-#: help.c:689
+#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
-#: help.c:694
+#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
+msgstr ""
+"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
-#: help.c:702
+#: help.c:695
#, 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'."
+msgstr "git: «%s» no és un ordre de git. Vegeu «git --help»."
-#: help.c:706
+#: help.c:699
msgid ""
"\n"
"The most similar command is"
"L'ordre més similar és"
msgstr[1] ""
"\n"
-"Les ordres més similar són"
+"Les ordres més similars són"
-#: help.c:721
+#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
-#: help.c:789
+#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:793
+#: help.c:786
msgid ""
"\n"
"Did you mean this?"
"\n"
"Volíeu dir un d'aquests?"
-#: ident.c:345
+#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
"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:369
+#: ident.c:379
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:374
+#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
-msgstr "no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha rebut «%s»)"
+msgstr ""
+"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
+"rebut «%s»)"
-#: ident.c:384
+#: ident.c:401
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:390
+#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
-#: ident.c:398
+#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: ident.c:404
+#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:419 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
+
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
+
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
+
#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
-msgstr ""
+msgstr "no es poden combinar múltiples especificacions de filtratge"
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
+msgstr "s'esperava «tree:<profunditat>»"
+
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
msgstr ""
-#: list-objects-filter-options.c:152
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtre d'especificació no vàlid: «%s»"
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr ""
"No s'ha pogut crear '%s.lock': %s.\n"
"\n"
"Sembla que un altre procés de git s'està executant en aquest\n"
-"dipòsit, per exemple, un editor obert per 'git commit'. \n"
-"Assegureu-vos que tots els processos s'hagin terminat i\n"
+"dipòsit, per exemple, un editor obert per «git commit». \n"
+"Assegureu-vos que tots els processos s'hagin acabat i\n"
"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
"git ha tingut un error:\n"
"elimineu el fitxer manualment per a continuar."
#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
-msgstr "No s'ha pogut crear '%s.lock': %s"
+msgstr "No s'ha pogut crear «%s.lock»: %s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918 builtin/checkout.c:416 builtin/checkout.c:745
-#: builtin/clone.c:771
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: merge-recursive.c:332
+#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:355
-#, fuzzy, c-format
+#: merge-recursive.c:345
+#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat per al camí «%s»"
+msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió."
-#: merge-recursive.c:364
-#, fuzzy, c-format
+#: merge-recursive.c:354
+#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat per al camí «%s»"
+msgstr "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió."
-#: merge-recursive.c:447
+#: merge-recursive.c:437
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:902
+#: merge-recursive.c:863
#, 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:913
+#: merge-recursive.c:874
#, 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:927 merge-recursive.c:946
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:936
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:978 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no es pot llegir l'objecte %s «%s»"
-#: merge-recursive.c:980
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:1004
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: merge-recursive.c:1015
+#: merge-recursive.c:976
#, 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:1020
+#: merge-recursive.c:981
#, 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:1211
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
-#: merge-recursive.c:1218
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
-#: merge-recursive.c:1225
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (les comissions no segueixen merge-base)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (les comissions no "
+"segueixen merge-base)"
-#: merge-recursive.c:1233 merge-recursive.c:1245
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
-#: merge-recursive.c:1236 merge-recursive.c:1248
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançament ràpid al submòdul %s"
-#: merge-recursive.c:1271
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1275
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
-#: merge-recursive.c:1276
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
-#: merge-recursive.c:1279
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1288
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples fusions)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
+"fusions)"
-#: merge-recursive.c:1361
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-recursive.c:1366
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:1398
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1419
-#, fuzzy, c-format
+#: merge-recursive.c:1387
+#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
+msgstr "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s."
-#: merge-recursive.c:1486
+#: merge-recursive.c:1459
#, c-format
-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."
+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."
-#: merge-recursive.c:1491
+#: merge-recursive.c:1464
#, c-format
-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."
+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."
-#: merge-recursive.c:1498
+#: merge-recursive.c:1471
#, c-format
-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."
+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."
-#: merge-recursive.c:1503
+#: merge-recursive.c:1476
#, 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."
+msgid ""
+"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:1537
+#: merge-recursive.c:1511
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1537
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
#, c-format
msgid "Refusing to lose dirty file at %s"
-msgstr "s'està refusant a perdre el fitxer brut a %s"
+msgstr "S'està refusant a perdre el fitxer brut a %s"
-#: merge-recursive.c:1643
-#, fuzzy, c-format
+#: merge-recursive.c:1601
+#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
+msgstr "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig de l'operació."
-#: merge-recursive.c:1706
-#, fuzzy, c-format
+#: merge-recursive.c:1659
+#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s 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 a %s. S'ha afegit %s a "
+"%s"
-#: merge-recursive.c:1734
+#: merge-recursive.c:1690
#, 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:1739
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint com a %s"
+msgstr ""
+"s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
+"com a %s"
-#: merge-recursive.c:1759
+#: merge-recursive.c:1714
#, c-format
-msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s"
+msgid ""
+"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:1764
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1828
#, 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"
+msgstr ""
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
+"nom %s->%s en %s"
-#: merge-recursive.c:2064
+#: merge-recursive.c:2035
#, c-format
msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because directory %s was renamed to multiple other "
-"directories, with no destination getting a majority of the files."
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2096
+#: merge-recursive.c:2067
#, c-format
msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of implicit directory rename(s) putting the "
-"following path(s) there: %s."
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-recursive.c:2106
+#: merge-recursive.c:2077
#, c-format
msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; implicit directory renames tried to put these "
-"paths there: %s"
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-recursive.c:2198
+#: merge-recursive.c:2169
#, fuzzy, c-format
-msgid "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %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"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
+"nom %s->%s en %s"
-#: merge-recursive.c:2443
+#: merge-recursive.c:2413
#, c-format
-msgid "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was renamed."
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
+"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell mateix ja havia canviat de nom."
-#: merge-recursive.c:3022
+#: merge-recursive.c:2937
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:3025
+#: merge-recursive.c:2940
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3004
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:3094
+#: merge-recursive.c:3004
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:3105
+#: merge-recursive.c:3016
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:3112
+#: merge-recursive.c:3020
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:3160
+#: merge-recursive.c:3043
#, 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:3182 git-submodule.sh:861
+#: merge-recursive.c:3065 git-submodule.sh:937
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:3183
+#: merge-recursive.c:3066
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:3216
+#: merge-recursive.c:3096
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:3319
+#: merge-recursive.c:3178
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3181
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3185
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+
+#: merge-recursive.c:3188
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-recursive.c:3302
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:3345
+#: merge-recursive.c:3325
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:3351
+#: merge-recursive.c:3330
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:3358
+#: merge-recursive.c:3337
#, 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:3367
+#: merge-recursive.c:3346
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:3376
-#, fuzzy, c-format
+#: merge-recursive.c:3355
+#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
+msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
-#: merge-recursive.c:3417
+#: merge-recursive.c:3393
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
" %s"
-#: merge-recursive.c:3428
+#: merge-recursive.c:3404
msgid "Already up to date!"
msgstr "Ja està al dia!"
-#: merge-recursive.c:3437
+#: merge-recursive.c:3413
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:3536
+#: merge-recursive.c:3512
msgid "Merging:"
msgstr "S'està fusionant:"
-#: merge-recursive.c:3549
+#: merge-recursive.c:3525
#, 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:3588
+#: merge-recursive.c:3564
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:3654
+#: merge-recursive.c:3630
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
+#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
-#: midx.c:65
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:81
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:86
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:91
+#: midx.c:95
#, fuzzy, c-format
msgid "hash version %u does not match"
msgstr "el camí «%s» no té la seva versió"
-#: midx.c:105
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:129
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:142
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:144
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:146
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:148
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:162
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:205
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:246
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:271
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:407
+#: midx.c:470
#, fuzzy, c-format
msgid "failed to add packfile '%s'"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: midx.c:413
+#: midx.c:476
#, fuzzy, c-format
msgid "failed to open pack-index '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: midx.c:507
+#: midx.c:536
#, fuzzy, c-format
msgid "failed to locate object %d in packfile"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: midx.c:943
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1036
#, fuzzy, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "s'ha produït un error en netejar l'índex"
-#: midx.c:981
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
+msgstr "S'estan cercant fitxers de paquets referenciats"
+
+#: midx.c:1106
#, c-format
-msgid "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
msgstr ""
-#: midx.c:992
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:996
-#, fuzzy
+#: midx.c:1138
+msgid "Sorting objects by packfile"
+msgstr "S'estan ordenant els objectes per fitxer de paquet"
+
+#: midx.c:1144
msgid "Verifying object offsets"
-msgstr "S'estan escrivint els objectes"
+msgstr "S'estan verificant els desplaçaments dels objectes"
-#: midx.c:1004
+#: midx.c:1160
#, fuzzy, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "no s'ha pogut afegir una entrada de cau per a %s"
-#: midx.c:1010
+#: midx.c:1166
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-#: midx.c:1019
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "no s'ha pogut executar el pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "no s'ha pogut finalitzar el pack-objects"
+
+#: name-hash.c:532
#, fuzzy, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, fuzzy, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, fuzzy, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "no s'ha pogut crear fil: %s"
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you "
-"start a new notes merge."
+"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"
-"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."
+"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:284
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:607
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: packfile.c:1870
+#: packfile.c:1899
#, 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?)"
-#: packfile.c:1874
+#: packfile.c:1903
#, 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?)"
-#: parse-options.c:35
+#: parse-options.c:38
#, c-format
msgid "%s requires a value"
msgstr "%s requereix un valor"
-#: parse-options.c:69
+#: parse-options.c:73
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s és incompatible amb %s"
-#: parse-options.c:74
+#: parse-options.c:78
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s: és incompatible amb alguna altra cosa"
-#: parse-options.c:88 parse-options.c:92 parse-options.c:260
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
msgid "%s takes no value"
msgstr "%s no accepta cap valor"
-#: parse-options.c:90
+#: parse-options.c:94
#, c-format
msgid "%s isn't available"
msgstr "%s no és disponible"
-#: parse-options.c:178
-#, c-format
-msgid "%s expects a numerical value"
-msgstr "%s espera un valor numèric"
-
-#: parse-options.c:194
+#: parse-options.c:219
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: parse-options.c:322
+#: parse-options.c:389
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: parse-options.c:356 parse-options.c:364
+#: parse-options.c:423 parse-options.c:431
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: parse-options.c:649
+#: parse-options.c:859
#, c-format
msgid "unknown option `%s'"
msgstr "opció desconeguda «%s»"
-#: parse-options.c:651
-#, fuzzy, c-format
+#: parse-options.c:861
+#, c-format
msgid "unknown switch `%c'"
-msgstr "port desconegut %s"
+msgstr "«switch» «%c» desconegut"
-#: parse-options.c:653
+#: parse-options.c:863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opció no ascii desconeguda en la cadena: «%s»"
-#: parse-options.c:675
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:694
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:700
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:703
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:742
+#: parse-options.c:954
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:21
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "àlies de --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "l'opció «%s» espera un valor numèric"
-#: parse-options-cb.c:38
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "data de venciment «%s» mal formada"
-#: parse-options-cb.c:51
+#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
+msgstr "l'opció «%s» espera «always», «auto» o «never»"
-#: parse-options-cb.c:110
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "nom d'objecte «%s» mal format"
-#: path.c:894
+#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
#: pathspec.c:128
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:146
msgid "Only one 'attr:' specification is allowed."
-msgstr "Només es permet una especificació 'attr:'."
+msgstr "Només es permet una especificació «attr:»."
#: pathspec.c:149
msgid "attr spec must not be empty"
#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "els paràmetres d'especificació de camí 'glob' i 'noglob' globals són incompatibles"
+msgstr ""
+"els paràmetres d'especificació de camí «glob» i «noglob» globals són "
+"incompatibles"
#: pathspec.c:264
-msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings"
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-"el paràmetre d'especificació de camí 'literal' global és incompatible amb tots els altres paràmetres "
-"d'especificació de camí globals"
+"el paràmetre d'especificació de camí «literal» global és incompatible amb "
+"tots els altres paràmetres d'especificació de camí globals"
#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'"
+msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
#: pathspec.c:325
#, c-format
#: pathspec.c:330
#, 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»"
+msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
#: pathspec.c:368
#, c-format
#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: 'literal' i 'glob' són incompatibles"
+msgstr "%s: «literal» i «glob» són incompatibles"
#: pathspec.c:440
#, c-format
#: pathspec.c:524
#, 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:591
#, 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"
-#: pkt-line.c:104
-#, fuzzy
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "no s'ha pogut escriure el paquet de buidatge"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "no s'ha pogut escriure el paquet delim"
+
+#: pkt-line.c:106
msgid "flush packet write failed"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgstr "s'ha produït un error en escriure el paquet de buidatge"
-#: pkt-line.c:144 pkt-line.c:230
+#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
-msgstr ""
+msgstr "error de protocol: longitud de línia impossible"
-#: pkt-line.c:160 pkt-line.c:162
-#, fuzzy
+#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
+msgstr "ha fallat l'escriptura del paquet amb format"
-#: pkt-line.c:194
+#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
-msgstr "no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del paquet"
+msgstr ""
+"no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
+"paquet"
-#: pkt-line.c:201 pkt-line.c:208
+#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "no s'ha pogut escriure el paquet"
-#: pkt-line.c:293
+#: pkt-line.c:295
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:301
+#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "el remot ha penjat inesperadament"
-#: pkt-line.c:329
+#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: pkt-line.c:339 pkt-line.c:344
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocol: longitud de línia errònia %d"
-#: pkt-line.c:353
+#: pkt-line.c:362
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
msgid "unable to create threaded lstat: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: pretty.c:963
+#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "no s'ha pogut iniciar «log»"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "no s'ha pogut llegir la sortida de «log»"
-#: range-diff.c:74 sequencer.c:4828
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "s'ha produït un error en generar el diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
-#: read-cache.c:673
-#, fuzzy, c-format
+#: read-cache.c:680
+#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "%s: ja existeix en l'índex"
+msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
-#: read-cache.c:689
-#, fuzzy
+#: read-cache.c:696
msgid "cannot create an empty blob in the object database"
-msgstr "escriu l'objecte a la base de dades d'objectes"
+msgstr "no es pot crear un blob buit a la base de dades d'objectes"
-#: read-cache.c:710
+#: read-cache.c:718
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
-msgstr ""
+msgstr "%s: només pot afegir fitxers normals, enllaços simbolics o directoris git"
-#: read-cache.c:765
+#: read-cache.c:723
#, fuzzy, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "«%s» no assenyala una comissió"
+
+#: read-cache.c:775
+#, c-format
msgid "unable to index file '%s'"
-msgstr "no es pot llegir el fitxer d'índex"
+msgstr "no es pot llegir indexar el fitxer «%s»"
-#: read-cache.c:784
-#, fuzzy, c-format
+#: read-cache.c:794
+#, c-format
msgid "unable to add '%s' to index"
-msgstr "No s'ha pogut afegir %s a la base de dades"
+msgstr "no s'ha pogut afegir «%s» a l'índex"
-#: read-cache.c:795
+#: read-cache.c:805
#, fuzzy, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut actualitzar %s"
-#: read-cache.c:1304
+#: read-cache.c:1314
#, fuzzy, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "%s existeix i no és directori"
-#: read-cache.c:1489
+#: read-cache.c:1499
msgid "Refresh index"
msgstr "Actualitza l'índex"
-#: read-cache.c:1603
+#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1613
+#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1684
+#: read-cache.c:1679
#, c-format
msgid "bad signature 0x%08x"
msgstr "signatura malmesa 0x%08x"
-#: read-cache.c:1687
+#: read-cache.c:1682
#, c-format
msgid "bad index version %d"
msgstr "versió d'índex incorrecta %d"
-#: read-cache.c:1696
+#: read-cache.c:1691
msgid "bad index file sha1 signature"
msgstr "signatura sha1 malmesa al fitxer d'índex"
-#: read-cache.c:1726
+#: read-cache.c:1721
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
-#: read-cache.c:1728
+#: read-cache.c:1723
#, c-format
msgid "ignoring %.4s extension"
msgstr "s'està ignorant l'extensió %.4s"
-#: read-cache.c:1765
-#, fuzzy, c-format
+#: read-cache.c:1760
+#, c-format
msgid "unknown index entry format 0x%08x"
-msgstr "Format d'arxiu desconegut «%s»"
+msgstr "Format d'entrada d'índex desconeguda «0x%08x»"
-#: read-cache.c:1781
+#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
-msgstr ""
+msgstr "camp del nom mal formatat l'index, camí a prop «%s»"
-#: read-cache.c:1836
+#: read-cache.c:1833
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1839
+#: read-cache.c:1836
#, fuzzy, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: read-cache.c:1842
+#: read-cache.c:1839
#, fuzzy, c-format
msgid "unordered stage entries for '%s'"
msgstr "no s'han pogut crear directoris per %s"
-#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:459
-#: builtin/check-ignore.c:178 builtin/checkout.c:294 builtin/checkout.c:622 builtin/checkout.c:991
-#: builtin/clean.c:955 builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498 builtin/mv.c:145
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: read-cache.c:2090
+#: read-cache.c:2087
#, fuzzy, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2103
+#: read-cache.c:2100
#, fuzzy, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2136
+#: read-cache.c:2133
#, fuzzy, c-format
msgid "%s: index file open failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
-#: read-cache.c:2140
+#: read-cache.c:2137
#, fuzzy, c-format
msgid "%s: cannot stat the open index"
msgstr "no es pot llegir l'índex"
-#: read-cache.c:2144
+#: read-cache.c:2141
#, c-format
msgid "%s: index file smaller than expected"
-msgstr ""
+msgstr "%s: fitxer d'índex més petit que s'esperava"
-#: read-cache.c:2148
-#, fuzzy, c-format
+#: read-cache.c:2145
+#, c-format
msgid "%s: unable to map index file"
-msgstr "no es pot llegir el fitxer d'índex"
+msgstr "%s: no es pot mapar el fitxer d'índex"
-#: read-cache.c:2190
+#: read-cache.c:2187
#, fuzzy, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2217
+#: read-cache.c:2214
#, fuzzy, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: read-cache.c:2239
+#: read-cache.c:2246
#, fuzzy, c-format
msgid "could not freshen shared index '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: read-cache.c:2274
+#: read-cache.c:2293
#, c-format
msgid "broken index, expect %s in %s, got %s"
-msgstr ""
+msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
-#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:3057
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:3069
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: read-cache.c:3088
+#: read-cache.c:3142
#, fuzzy, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: read-cache.c:3237
+#: read-cache.c:3291
#, fuzzy, c-format
msgid "%s: cannot drop to stage #0"
msgstr "no es pot canviar de directori a %s"
-#: rebase-interactive.c:10
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
+"ignorant."
+
+#: rebase-interactive.c:35
#, fuzzy
msgid ""
"\n"
" 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 (la resta 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 (la resta 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"
-#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:56
+#, fuzzy, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
+msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"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"
-#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
-#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
-msgstr "Nota que les comissions buides estan comentades"
+msgstr "Tingueu en compte que les comissions buides estan comentades"
-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219 sequencer.c:4569 sequencer.c:4625
-#: sequencer.c:4900
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+msgid "could not write '%s'"
+msgstr "no s'ha pogut escriure «%s»"
-#: refs.c:192
-#, fuzzy, c-format
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
+msgstr "no s'ha pogut copiar «%s» a «%s»."
+
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
+"Les comissions descartades (més nova a més vella):\n"
+
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"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"
+"Els comportaments possibles són: ignore, warn, error.\n"
+
+#: refs.c:262
+#, c-format
msgid "%s does not point to a valid object!"
-msgstr "«%s» no assenyala una comissió"
+msgstr "%s no apunta a un objecte vàlid"
-#: refs.c:583
+#: refs.c:667
#, fuzzy, c-format
msgid "ignoring dangling symref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: refs.c:585 ref-filter.c:1976
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: refs.c:711
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no s'ha pogut obrir «%s» per a escriptura: %s"
-#: refs.c:721 refs.c:772
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
-msgstr "no s'ha pogut llegir la referència %s"
+msgstr "no s'ha pogut llegir la referència «%s»"
-#: refs.c:727
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "la referència «%s» ja existeix"
-#: refs.c:732
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "ID d'objecte no esperat en escriure «%s»"
-#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675 sequencer.c:2689 sequencer.c:2923 sequencer.c:4789
-#: sequencer.c:4852 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395 builtin/am.c:713 builtin/rebase.c:575
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "no s'ha pogut obrir «%s» per a escriptura"
-#: refs.c:774
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID d'objecte no esperat en suprimir «%s»"
-#: refs.c:905
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:911
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:969
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1061
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
-msgstr "s'està refusant la referència amb nom malmès %s"
+msgstr "s'està refusant la referència amb nom malmès «%s»"
-#: refs.c:1137
+#: refs.c:1231
#, fuzzy, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "s'ha produït un error en obrir «%s»: %s"
-#: refs.c:1911
+#: refs.c:2012
#, fuzzy, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "nom d'identitat buit (per <%s>) no és permès"
-#: refs.c:1943
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-#: refs.c:2039 refs.c:2069
-#, fuzzy, c-format
+#: refs.c:2140 refs.c:2170
+#, c-format
msgid "'%s' exists; cannot create '%s'"
-msgstr "no es pot crear «%s»"
+msgstr "«%s» existeix; no es pot crear «%s»"
-#: refs.c:2045 refs.c:2080
-#, fuzzy, c-format
+#: refs.c:2146 refs.c:2181
+#, c-format
msgid "cannot process '%s' and '%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 processar «%s» i «%s» a la vegada"
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "no s'ha pogut eliminar la referència %s"
-#: refs/files-backend.c:1242 refs/packed-backend.c:1532 refs/packed-backend.c:1542
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "no s'han pogut suprimir les referències: %s"
msgid "invalid refspec '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: ref-filter.c:39 wt-status.c:1861
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "no hi és"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "davant per %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "darrere per %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "paràmetre %%(%s) desconegut: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, fuzzy, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, fuzzy, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(objectsize) no accepta paràmetres"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "paràmetre %%(trailers) desconegut: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positiu esperat nom d'objecte:curt=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "paràmetre %%(if) no reconegut: %s"
-#: ref-filter.c:527
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:554
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:587
#, c-format
-msgid "not a git repository, but the field '%.*s' requires access to object data"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:682
+#: ref-filter.c:711
#, 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:745
+#: ref-filter.c:774
#, 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:747
+#: ref-filter.c:776
#, 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:749
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, 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:779
+#: ref-filter.c:808
#, 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:781
+#: ref-filter.c:810
#, 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:796
+#: ref-filter.c:825
#, 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:853
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1447
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: ref-filter.c:1485
+#, fuzzy, c-format
+msgid "no branch, rebasing %s"
msgstr "(cap branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1450
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
+#: ref-filter.c:1488
+#, fuzzy, c-format
+msgid "no branch, rebasing detached HEAD %s"
msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)"
-#: ref-filter.c:1453
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
+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:1461
-#, 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:1468
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD separat de %s)"
-
-#: ref-filter.c:1472
-msgid "(no branch)"
-msgstr "(cap branca)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "sense branca"
-#: ref-filter.c:1506 ref-filter.c:1663
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1516
+#: ref-filter.c:1547
#, 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:1882
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
-#: ref-filter.c:1971
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:2257
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2352
-#, fuzzy, c-format
+#: ref-filter.c:2482
+#, c-format
msgid "option `%s' is incompatible with --merged"
-msgstr "--long és incompatible amb --abbrev=0"
+msgstr "l'opció «%s» és incompatible amb --merged"
-#: ref-filter.c:2355
-#, fuzzy, c-format
+#: ref-filter.c:2485
+#, c-format
msgid "option `%s' is incompatible with --no-merged"
-msgstr "--long és incompatible amb --abbrev=0"
+msgstr "l'opció «%s» és incompatible amb --no-merged"
-#: ref-filter.c:2365
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: ref-filter.c:2370
-#, fuzzy, c-format
+#: ref-filter.c:2500
+#, c-format
msgid "option `%s' must point to a commit"
-msgstr "«%s» no assenyala una comissió"
+msgstr "l'opció «%s» ha d'apuntar a una comissió"
#: remote.c:363
#, c-format
msgstr ""
#: remote.c:1091
-#, fuzzy, c-format
+#, c-format
msgid "%s cannot be resolved to branch"
-msgstr "«%s» no es pot usar amb canvi de branca"
+msgstr "«%s» no es pot resoldre a una branca"
#: remote.c:1102
-#, fuzzy, c-format
+#, c-format
msgid "unable to delete '%s': remote ref does not exist"
-msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
+msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
#: remote.c:1114
#, c-format
#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: «%s»"
+msgstr "no existeix la branca: «%s»"
#: remote.c:1636
#, c-format
#: remote.c:1657
#, 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:1669
#, c-format
#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és 'nothing')"
+msgstr "push no té destí (push.default és «nothing)"
#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
#: remote.c:1840
-#, fuzzy, c-format
+#, c-format
msgid "couldn't find remote ref %s"
-msgstr "No s'ha pogut trobar la referència HEAD remota"
+msgstr "no s'ha pogut trobar la referència remota %s"
#: remote.c:1853
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:1990
+#: remote.c:2016
#, 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:1994
+#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n"
-#: remote.c:1997
+#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "La vostra branca està al dia amb «%s».\n"
-#: remote.c:2001
+#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
-#: remote.c:2004
+#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2008
+#: remote.c:2034
#, 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"
+msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
+msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
-#: remote.c:2014
+#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n"
-#: remote.c:2017
+#: remote.c:2043
#, 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» %d comissió, i pot avançar-se ràpidament.\n"
-msgstr[1] "La vostra branca està darrere de «%s» %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à %2$d comissió per darrere de «%1$s», i pot avançar-se "
+"ràpidament.\n"
+msgstr[1] ""
+"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
+"se ràpidament.\n"
-#: remote.c:2025
+#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
+msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n"
-#: remote.c:2028
+#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:2038
+#: remote.c:2064
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"
+msgstr " (useu «git pull» per a fusionar la branca remota a la vostra)\n"
-#: remote.c:2221
-#, fuzzy, c-format
+#: remote.c:2247
+#, c-format
msgid "cannot parse expected object name '%s'"
-msgstr "no es pot llegir l'objecte %s «%s»"
+msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
#: replace-object.c:21
#, fuzzy, c-format
msgid "unable to write rerere record"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212 builtin/fsck.c:314
-#, fuzzy, c-format
-msgid "could not write '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
#: rerere.c:495
#, fuzzy, c-format
msgid "there were errors while writing '%s' (%s)"
msgid "Recorded preimage for '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "no s'ha pogut crear el directori «%s»"
msgid "unable to open rr-cache directory"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: revision.c:2484
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2487
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2684
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
-#: run-command.c:742
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#: run-command.c:763
msgid "open /dev/null failed"
msgstr "s'ha produït un error en obrir /dev/null"
-#: run-command.c:1231
+#: run-command.c:1269
#, fuzzy, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: run-command.c:1295
+#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
-msgstr "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament remot"
+msgstr ""
+"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
+"remot"
#: send-pack.c:143
#, c-format
msgstr "el destí receptor no admet pujar --signed"
#: send-pack.c:422
-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"
+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"
#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:184
+#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
-#: sequencer.c:288
+#: sequencer.c:292
#, fuzzy, c-format
msgid "could not delete '%s'"
msgstr "No s'ha pogut suprimir %s"
-#: sequencer.c:314
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revertir"
-#: sequencer.c:316
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:318
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:320
+#: sequencer.c:327
#, fuzzy, c-format
msgid "unknown action: %d"
msgstr "Acció desconeguda: %d"
-#: sequencer.c:378
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: sequencer.c:381
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:394 sequencer.c:2671
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:401
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691 sequencer.c:2931
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
-#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574 sequencer.c:2913 sequencer.c:3022
-#: builtin/am.c:245 builtin/commit.c:748 builtin/merge.c:1085 builtin/rebase.c:154
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "no s'ha pogut llegir «%s»"
-#: sequencer.c:455
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:459
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:491
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
+#: sequencer.c:537 builtin/tag.c:565
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Mode de neteja no vàlid %s"
+
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:582
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:598
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: sequencer.c:612
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: sequencer.c:692
+#: sequencer.c:743
#, fuzzy, c-format
msgid "no key present in '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:703
+#: sequencer.c:754
#, fuzzy, c-format
msgid "unable to dequote value of '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704 builtin/am.c:796 builtin/merge.c:1082
-#: builtin/rebase.c:617
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
-#: sequencer.c:750
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-#: sequencer.c:755
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:760
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-#: sequencer.c:764
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable «%s» desconeguda"
-#: sequencer.c:769
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta «GIT_AUTHOR_NAME»"
-#: sequencer.c:771
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:773
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta «GIT_AUTHOR_DATE»"
-#: sequencer.c:833
+#: sequencer.c:884
#, fuzzy, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "format de data no vàlid: %s"
-#: sequencer.c:850
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" 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"
"\n"
" git rebase --continue\n"
-#: sequencer.c:945
+#: sequencer.c:995
#, fuzzy
msgid "writing root commit"
msgstr "no hi ha res a cometre\n"
-#: sequencer.c:1155
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
-#: sequencer.c:1162
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
"S'han configurat el vostre nom i adreça electrònica\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. \n"
+"automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
"Comproveu que siguin correctes. Podeu suprimir aquest\n"
"missatge establint-los explícitament. Executeu l'ordre següent i\n"
"seguiu les instruccions en el vostre editor per editar el vostre\n"
"fitxer de configuració:\n"
"\n"
" git config --global --edit\n"
-"Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
+"Després de fer això, podeu esmenar la identitat usada per a aquesta\n"
"comissió amb:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1175
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1217
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: sequencer.c:1219
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: sequencer.c:1265
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
-#: sequencer.c:1267
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD separat"
-#: sequencer.c:1271
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: sequencer.c:1292
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
-#: sequencer.c:1294
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
-#: sequencer.c:1298 builtin/commit.c:1546
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: sequencer.c:1350 sequencer.c:1964
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
-#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: sequencer.c:1377 sequencer.c:1433
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
-#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859 builtin/merge.c:884
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: sequencer.c:1460
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: sequencer.c:1465
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
-#: sequencer.c:1565 sequencer.c:1675
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:1622 sequencer.c:1647
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:1632 sequencer.c:4808
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:1634 sequencer.c:2958
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:1636
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:1642
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
-#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:1657
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:1664
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:1670
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:1758
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:1765
+#: sequencer.c:1805
#, fuzzy
msgid "cannot fixup root commit"
msgstr "no es pot trobar la comissió %s (%s)"
-#: sequencer.c:1784
+#: sequencer.c:1824
#, 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:1792 sequencer.c:1800
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:1806
+#: sequencer.c:1846
#, 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:1825
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1890
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:1945
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:1946
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:2005
+#: sequencer.c:2045
#, 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:2012
+#: sequencer.c:2052
#, 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:2094
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no accepta paràmetres: «%s»"
-#: sequencer.c:2103
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "falten els arguments per %s"
-#: sequencer.c:2163
+#: sequencer.c:2174
+#, fuzzy, c-format
+msgid "could not parse '%.*s'"
+msgstr "no s'ha pogut analitzar «%s»"
+
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:2171
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:2243
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
+
+#: sequencer.c:2323
+#, fuzzy
+msgid "cancelling a cherry picking in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2330
+#, fuzzy
+msgid "cancelling a revert in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
-#: sequencer.c:2245
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:2250
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:2261
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:2263
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:2333
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:2420
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2436
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:2518 sequencer.c:4067
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:2526
-msgid "a cherry-pick or revert is already in progress"
+#: sequencer.c:2668
+#, fuzzy
+msgid "revert is already in progress"
+msgstr "un «cherry pick» o una reversió ja està en curs"
+
+#: sequencer.c:2670
+#, fuzzy, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:2673
+#, fuzzy
+msgid "cherry-pick is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
-#: sequencer.c:2527
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2675
+#, fuzzy, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:2530
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:2544
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:2599 sequencer.c:3819
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:2601
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:2603 sequencer.c:2638
+#: sequencer.c:2768 sequencer.c:2812
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:2624 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
-#: sequencer.c:2626
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:2627
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:2633
+#: sequencer.c:2807
#, 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:2644
+#: sequencer.c:2818
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:2750 sequencer.c:3735
+#: sequencer.c:2859
+#, fuzzy
+msgid "no revert in progress"
+msgstr "No hi ha un «rebase» en curs?"
+
+#: sequencer.c:2867
+#, fuzzy
+msgid "no cherry-pick in progress"
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+
+#: sequencer.c:2877
+#, fuzzy
+msgid "failed to skip the commit"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sequencer.c:2788 sequencer.c:3715
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: sequencer.c:2805
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:2813
+#: sequencer.c:3074
#, fuzzy, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: sequencer.c:2823
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
-#: sequencer.c:2830
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
-#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230 builtin/rebase.c:1591
-#: builtin/rebase.c:1646
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: sequencer.c:2875
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:2881
+#: sequencer.c:3142
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:2887
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2948
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
-#: sequencer.c:3002
+#: sequencer.c:3263
#, fuzzy
msgid "writing fake root commit"
msgstr "no hi ha res a cometre\n"
-#: sequencer.c:3007
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "S'ha produït un error en cercar l'arbre de %s."
-#: sequencer.c:3063 builtin/rebase.c:448
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
-#: sequencer.c:3090
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: sequencer.c:3118
+#: sequencer.c:3379
#, fuzzy
msgid "cannot merge without a current revision"
msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:3140
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:3149
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "no hi ha res per fusionar «%.*s»"
-#: sequencer.c:3161
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3176
+#: sequencer.c:3437
#, fuzzy, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:3325
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no s'ha pogut fusionar «%.*s»"
-#: sequencer.c:3341
+#: sequencer.c:3606
#, fuzzy
msgid "merge: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:3409 builtin/rebase.c:298
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:3421
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:3424 builtin/rebase.c:314
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Els vostres canvis estan segurs en el «stash».\n"
"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
-#: sequencer.c:3478
+#: sequencer.c:3751
#, fuzzy, c-format
msgid "could not checkout %s"
msgstr "no es pot agafar %s"
-#: sequencer.c:3492
+#: sequencer.c:3765
#, fuzzy, c-format
msgid "%s: not a valid OID"
msgstr "«%s» no és un terme vàlid"
-#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: sequencer.c:3512
+#: sequencer.c:3785
#, fuzzy, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3514
+#: sequencer.c:3787
#, fuzzy, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3522
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3597
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:3677
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:3723
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
-#: sequencer.c:3728 sequencer.c:4805
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
-#: sequencer.c:3742
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:3831
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:3840
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:3842
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:3844
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:3847
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: sequencer.c:3883 sequencer.c:3921
+#: sequencer.c:4167 sequencer.c:4205
#, fuzzy, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: sequencer.c:3936
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:3943
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
-#: sequencer.c:4044
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:4048
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
-#: sequencer.c:4083
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: sequencer.c:4529
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
-#: sequencer.c:4532
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "llista per a fer inestable: «%s»"
-
-#: sequencer.c:4684
-#, c-format
-msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està ignorant."
-
-#: sequencer.c:4754
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
-"Les comissions descartades (més nova a més vella):\n"
-
-#: sequencer.c:4761
-#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr ""
-"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"
-"Els comportaments possibles són: ignore, warn, error.\n"
-
-#: sequencer.c:4774
-#, c-format
+#: sequencer.c:4971
msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr "Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --continue'.\n"
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
+"continue'.\n"
-#: sequencer.c:4912 sequencer.c:4950
-#, fuzzy
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
-msgstr "Res a fer"
-
-#: sequencer.c:4916
-#, fuzzy, c-format
-msgid "Rebase %s onto %s (%d command)"
-msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-
-#: sequencer.c:4928
-#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no s'ha pogut copiar «%s» a «%s»."
-
-#: sequencer.c:4932 sequencer.c:4961
-msgid "could not transform the todo list"
-msgstr "no s'ha pogut transformar la llista per a fer"
+msgstr "res a fer"
-#: sequencer.c:4964
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-#: sequencer.c:5047
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
msgid "'%s' is outside repository"
msgstr "«%s» és fora del dipòsit"
-#: setup.c:172
+#: setup.c:173
#, 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:185
+#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"paràmetre ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de treball.\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
+"paràmetre ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
+"treball.\n"
+"Useu «--» per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:234
+#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "l'opció «%s» ha de venir abans dels arguments opcionals"
-#: setup.c:253
+#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
-"Useu '--' per a separar els camins de les revisions, com això:\n"
+"Useu '--' per a separar els camins de les revisions:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:389
+#: setup.c:390
msgid "unable to set up work tree using invalid config"
-msgstr "no s'ha pogut configurar un arbre de treball utilitzant una configuració no vàlida"
+msgstr ""
+"no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
+"vàlida"
-#: setup.c:393
+#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "aquesta operació s'ha d'executar en un arbre de treball"
-#: setup.c:527
+#: setup.c:540
#, 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:535
+#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:554
+#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "s'ha produït un error en obrir «%s»"
-#: setup.c:556
+#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "massa larg per a ser un fitxer .git: «%s»"
-#: setup.c:558
+#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
-#: setup.c:560
+#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
-#: setup.c:562
+#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
-#: setup.c:564
+#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "no és un dipòsit de git: %s"
-#: setup.c:663
+#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
-#: setup.c:677
+#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un dipòsit de git: «%s»"
-#: setup.c:706 setup.c:708 setup.c:739
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no es pot canviar de directori a «%s»"
-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "no es pot tornar al directori de treball actual"
-#: setup.c:838
+#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
-#: setup.c:1068
+#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1077 setup.c:1083
+#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
-#: setup.c:1088
+#: setup.c:1103
#, 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:1094
+#: setup.c:1109
#, 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:1204
+#: setup.c:1220
#, 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."
-#: setup.c:1247
+#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "s'ha produït un error en obrir /dev/null o dup"
-#: setup.c:1262
+#: setup.c:1279
msgid "fork failed"
msgstr "el «fork» ha fallat"
-#: setup.c:1267
+#: setup.c:1284
msgid "setsid failed"
msgstr "l'«stash» ha fallat"
-#: sha1-file.c:445
+#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:496
+#: sha1-file.c:504
#, fuzzy, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:568
+#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:575
+#: sha1-file.c:583
#, fuzzy, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:618
+#: sha1-file.c:626
#, fuzzy
msgid "unable to fdopen alternates lockfile"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: sha1-file.c:636
+#: sha1-file.c:644
#, fuzzy
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer d'índex"
-#: sha1-file.c:643
+#: sha1-file.c:651
#, fuzzy
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: sha1-file.c:678
+#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
-#: sha1-file.c:704
+#: sha1-file.c:712
#, 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:710
+#: sha1-file.c:718
#, 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:716
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència «%s» és superficial"
-#: sha1-file.c:724
+#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència «%s» és empeltat"
-#: sha1-file.c:838
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:863
+#: sha1-file.c:968
msgid "mmap failed"
msgstr "mmap ha fallat"
-#: sha1-file.c:1027
+#: sha1-file.c:1132
#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
-#: sha1-file.c:1151 sha1-file.c:2288
+#: sha1-file.c:1256 sha1-file.c:2395
#, fuzzy, c-format
msgid "corrupt loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte «%s»"
-#: sha1-file.c:1153 sha1-file.c:2292
+#: sha1-file.c:1258 sha1-file.c:2399
#, fuzzy, c-format
msgid "garbage at end of loose object '%s'"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: sha1-file.c:1195
+#: sha1-file.c:1300
#, fuzzy
msgid "invalid object type"
msgstr "el tipus d'objecte és incorrecte."
-#: sha1-file.c:1279
+#: sha1-file.c:1384
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1282
+#: sha1-file.c:1387
#, fuzzy, c-format
msgid "unable to unpack %s header"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:1288
+#: sha1-file.c:1393
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1291
+#: sha1-file.c:1396
#, fuzzy, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:1481
+#: sha1-file.c:1587
#, fuzzy, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte «%s»."
-#: sha1-file.c:1485
+#: sha1-file.c:1591
#, fuzzy, c-format
msgid "replacement %s not found for %s"
msgstr "no s'han trobat les plantilles %s"
-#: sha1-file.c:1489
+#: sha1-file.c:1595
#, fuzzy, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
-#: sha1-file.c:1493
+#: sha1-file.c:1599
#, fuzzy, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objecte local %s és malmès"
-#: sha1-file.c:1595
+#: sha1-file.c:1702
#, fuzzy, c-format
msgid "unable to write file %s"
msgstr "no s'ha pogut escriure %s"
-#: sha1-file.c:1602
+#: sha1-file.c:1709
#, fuzzy, c-format
msgid "unable to set permission to '%s'"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: sha1-file.c:1609
+#: sha1-file.c:1716
#, fuzzy
msgid "file write error"
msgstr "escriptura fallada al rev-list"
-#: sha1-file.c:1628
+#: sha1-file.c:1735
#, fuzzy
msgid "error when closing loose object file"
msgstr "error en tancar el fitxer de paquet"
-#: sha1-file.c:1693
+#: sha1-file.c:1800
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1695
+#: sha1-file.c:1802
#, fuzzy
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un índex temporal"
-#: sha1-file.c:1719
+#: sha1-file.c:1826
#, fuzzy
msgid "unable to write loose object file"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: sha1-file.c:1725
+#: sha1-file.c:1832
#, fuzzy, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: sha1-file.c:1729
+#: sha1-file.c:1836
#, fuzzy, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "ha fallat fstat a %s"
-#: sha1-file.c:1733
+#: sha1-file.c:1840
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1743 builtin/pack-objects.c:919
+#: sha1-file.c:1850 builtin/pack-objects.c:920
#, fuzzy, c-format
msgid "failed utime() on %s"
msgstr "s'ha produït un error en obrir «%s»"
-#: sha1-file.c:1818
+#: sha1-file.c:1925
#, fuzzy, c-format
msgid "cannot read object for %s"
msgstr "no es pot llegir l'objecte %s"
-#: sha1-file.c:1858
+#: sha1-file.c:1965
#, fuzzy
msgid "corrupt commit"
msgstr "autor corregit de la comissió"
-#: sha1-file.c:1866
+#: sha1-file.c:1973
#, fuzzy
msgid "corrupt tag"
msgstr "informa de les etiquetes"
-#: sha1-file.c:1965
+#: sha1-file.c:2072
#, fuzzy, c-format
msgid "read error while indexing %s"
msgstr "error en llegir %s"
-#: sha1-file.c:1968
+#: sha1-file.c:2075
#, fuzzy, c-format
msgid "short read while indexing %s"
msgstr "no es pot llegir l'índex"
-#: sha1-file.c:2041 sha1-file.c:2050
+#: sha1-file.c:2148 sha1-file.c:2157
#, fuzzy, c-format
msgid "%s: failed to insert into database"
msgstr "gpg ha fallat en signar les dades"
-#: sha1-file.c:2056
+#: sha1-file.c:2163
#, fuzzy, c-format
msgid "%s: unsupported file type"
msgstr "versió d'índex no compatible %s"
-#: sha1-file.c:2080
+#: sha1-file.c:2187
#, fuzzy, c-format
msgid "%s is not a valid object"
msgstr "«%s» no és una terme vàlid"
-#: sha1-file.c:2082
+#: sha1-file.c:2189
#, fuzzy, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de «%s» vàlid"
-#: sha1-file.c:2109 builtin/index-pack.c:154
+#: sha1-file.c:2216 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: sha1-file.c:2299 sha1-file.c:2351
+#: sha1-file.c:2406 sha1-file.c:2458
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2323
+#: sha1-file.c:2430
#, fuzzy, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut obrir %s"
-#: sha1-file.c:2328
+#: sha1-file.c:2435
#, fuzzy, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut actualitzar %s"
-#: sha1-file.c:2334
+#: sha1-file.c:2441
#, fuzzy, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut llegir %s"
-#: sha1-file.c:2345
+#: sha1-file.c:2452
#, fuzzy, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'ha pogut analitzar el contacte: %s"
-#: sha1-name.c:448
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1-name.c:459
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1-name.c:742
+#: sha1-name.c:800
+#, fuzzy
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, fuzzy, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, fuzzy, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "octets"
+msgstr[1] "octets"
+
#: submodule.c:114 submodule.c:143
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:118 submodule.c:147
#, c-format
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "al submòdul no populat «%s»"
+msgstr "al submòdul sense popular «%s»"
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:906
+#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
-#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
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."
-#: submodule.c:1477
+#: submodule.c:1481
#, fuzzy, c-format
msgid "Could not access submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-#: submodule.c:1639
+#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» no reconegut com un dipòsit git"
-#: submodule.c:1777
+#: submodule.c:1789
#, 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:1790
+#: submodule.c:1802
#, 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:1805
+#: submodule.c:1817
#, fuzzy, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
-#: submodule.c:1895
+#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1947
+#: submodule.c:1959
#, fuzzy, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submòduls canviats però no actualitzats:"
-#: submodule.c:1996
+#: submodule.c:2007
#, 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:2008 submodule.c:2064
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:2015
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"«%s» a\n"
"«%s»\n"
-#: submodule.c:2099
+#: submodule.c:2109
#, 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:2143
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2182
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
msgid "ignoring suspicious submodule name: %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: submodule-config.c:296
+#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-#: submodule-config.c:390
+#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: submodule-config.c:479
+#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: submodule-config.c:754
+#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
msgid "running trailer command '%s' failed"
msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 trailer.c:557
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valor desconegut «%s» per a la clau «%s»"
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:617
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:625
#, fuzzy
msgid "could not parse transport.color.* config"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: transport.c:690
+#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:817
+#: transport.c:825
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconegut «%s» per a la clau «%s»"
-#: transport.c:883
+#: transport.c:891
#, fuzzy, c-format
msgid "transport '%s' not allowed"
msgstr "no s'ha trobat la branca «%s»."
-#: transport.c:937
+#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1032
+#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:1036
+#: transport.c:1044
#, c-format
msgid ""
"\n"
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:1044
+#: transport.c:1052
msgid "Aborting."
msgstr "S'està avortant."
-#: transport.c:1184
+#: transport.c:1193
#, fuzzy
msgid "failed to push all needed submodules"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: transport.c:1317 transport-helper.c:643
+#: transport.c:1340 transport-helper.c:645
#, fuzzy
msgid "operation not supported by protocol"
msgstr "opció no admesa amb --recurse-submodules."
-#: transport.c:1421
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
#: transport-helper.c:51 transport-helper.c:80
#, fuzzy
msgid "full write to remote helper failed"
msgstr "imprimeix l'estat des de l'ajudant remot"
-#: transport-helper.c:132
+#: transport-helper.c:134
#, fuzzy, c-format
msgid "unable to find remote helper for '%s'"
msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
-#: transport-helper.c:148 transport-helper.c:557
+#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:199
+#: transport-helper.c:201
#, c-format
-msgid "unknown mandatory capability %s; this remote helper probably needs newer version of Git"
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: transport-helper.c:205
+#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: transport-helper.c:274 transport-helper.c:414
#, fuzzy, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "blob esperat per a %s «%s»"
-#: transport-helper.c:401
+#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s també ha bloquejat %s"
-#: transport-helper.c:479
+#: transport-helper.c:481
#, fuzzy
msgid "couldn't run fast-import"
msgstr "no s'ha pogut executar «stash»."
-#: transport-helper.c:502
+#: transport-helper.c:504
#, fuzzy
msgid "error while running fast-import"
msgstr "error en tancar el fitxer de paquet"
-#: transport-helper.c:531 transport-helper.c:1097
+#: transport-helper.c:533 transport-helper.c:1105
#, fuzzy, c-format
msgid "could not read ref %s"
msgstr "No s'ha pogut llegir la referència %s"
-#: transport-helper.c:576
+#: transport-helper.c:578
#, fuzzy, c-format
msgid "unknown response to connect: %s"
msgstr "opció desconeguda: %s\n"
-#: transport-helper.c:598
+#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:600
+#: transport-helper.c:602
#, fuzzy
msgid "invalid remote service path"
msgstr "referència no vàlida: %s"
-#: transport-helper.c:646
+#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:718
+#: transport-helper.c:720
#, fuzzy, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "blob esperat per a %s «%s»"
-#: transport-helper.c:771
+#: transport-helper.c:773
#, fuzzy, c-format
msgid "helper reported unexpected status of %s"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-#: transport-helper.c:832
+#: transport-helper.c:834
#, fuzzy, c-format
msgid "helper %s does not support dry-run"
msgstr "El servidor no admet --deepen"
-#: transport-helper.c:835
+#: transport-helper.c:837
#, fuzzy, c-format
msgid "helper %s does not support --signed"
msgstr "El servidor no admet --shallow-since"
-#: transport-helper.c:838
+#: transport-helper.c:840
#, fuzzy, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "el destí receptor no admet pujar --signed"
-#: transport-helper.c:845
+#: transport-helper.c:847
#, fuzzy, c-format
msgid "helper %s does not support 'push-option'"
msgstr "el destí receptor no admet opcions de pujada"
-#: transport-helper.c:937
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:942
+#: transport-helper.c:950
#, fuzzy, c-format
msgid "helper %s does not support 'force'"
msgstr "El servidor no admet --deepen"
-#: transport-helper.c:989
+#: transport-helper.c:997
#, fuzzy
msgid "couldn't run fast-export"
msgstr "no s'ha pogut executar «stash»."
-#: transport-helper.c:994
+#: transport-helper.c:1002
#, fuzzy
msgid "error while running fast-export"
msgstr "error en tancar el fitxer de paquet"
-#: transport-helper.c:1019
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: transport-helper.c:1083
+#: transport-helper.c:1091
#, fuzzy, c-format
msgid "malformed response in ref list: %s"
msgstr "full d'opcions mal format: «%s»"
-#: transport-helper.c:1236
+#: transport-helper.c:1244
#, fuzzy, c-format
msgid "read(%s) failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1263
+#: transport-helper.c:1271
#, fuzzy, c-format
msgid "write(%s) failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1312
+#: transport-helper.c:1320
#, fuzzy, c-format
msgid "%s thread failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1316
+#: transport-helper.c:1324
#, fuzzy, c-format
msgid "%s thread failed to join: %s"
msgstr "s'ha produït un error en obrir «%s»"
-#: transport-helper.c:1335 transport-helper.c:1339
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1376
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1380
+#: transport-helper.c:1388
#, fuzzy, c-format
msgid "%s process failed"
msgstr "%s ha fallat"
-#: transport-helper.c:1398 transport-helper.c:1407
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr ""
msgid "empty filename in tree entry"
msgstr "nom de fitxer buit en una entrada d'arbre"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
"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"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
#: unpack-trees.c:113
"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:116
"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"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
#: unpack-trees.c:118
"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:121
"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"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:134
"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:137
"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"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:139
"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:142
#: unpack-trees.c:150
#, 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"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
#: unpack-trees.c:152
#, 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:155
"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"
"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:157
"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:160
"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"
"%%sMoveu-los o elimineu-los abans de %s."
#: unpack-trees.c:162
"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:170
"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:175
#, 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:177
#, 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:179
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:253
+#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:335
-msgid "Checking out files"
-msgstr "S'estan agafant fitxers"
+#: unpack-trees.c:318
+#, fuzzy
+msgid "Updating files"
+msgstr "S'està actualitzant %s"
-#: unpack-trees.c:367
+#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
msgid "invalid '..' path segment"
msgstr "segment de camí '..' no vàlid"
-#: worktree.c:249 builtin/am.c:2094
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "s'ha produït un error en llegir «%s»"
-#: worktree.c:295
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:306
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:318
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» no existeix"
-#: worktree.c:324
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "«%s» no és un fitxer .git, codi d'error %d"
-#: worktree.c:332
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "«%s» no assenyala de tornada a «%s»"
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wt-status.c:155
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:182 wt-status.c:209
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+#: wt-status.c:187 wt-status.c:219
+#, fuzzy
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
+
+#: wt-status.c:190 wt-status.c:222
+#, fuzzy, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:184 wt-status.c:211
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:188
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:190 wt-status.c:194
+#: wt-status.c:199 wt-status.c:203
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:192
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:203 wt-status.c:1046
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:221 wt-status.c:1055
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
-#: wt-status.c:225
+#: wt-status.c:238
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:227
+#: wt-status.c:240
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:228
-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)"
+#: wt-status.c:241
+#, fuzzy
+msgid ""
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
+"directori de treball)"
-#: wt-status.c:230
+#: wt-status.c:243
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:242
+#: wt-status.c:254
#, 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 que es cometrà)"
-#: wt-status.c:257
+#: wt-status.c:268
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:259
+#: wt-status.c:270
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:261
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:263
+#: wt-status.c:274
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:265
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:267
+#: wt-status.c:278
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:269
+#: wt-status.c:280
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:279
+#: wt-status.c:290
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:281
+#: wt-status.c:292
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:283
+#: wt-status.c:294
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:285
+#: wt-status.c:296
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:287
+#: wt-status.c:298
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:289
+#: wt-status.c:300
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:291
+#: wt-status.c:302
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:293
+#: wt-status.c:304
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:373
+#: wt-status.c:384
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:375
+#: wt-status.c:386
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:377
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:884
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "L'«stash» té actualment %d entrada"
msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:916
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:918
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:1000
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"No modifiqueu o suprimiu la línia de dalt.\n"
"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1101
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1104
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:1106
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:1110
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1113
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:1122
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1125
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1129
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:1131
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1133
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
-#: wt-status.c:1264
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "Manca git-rebase-todo."
-#: wt-status.c:1266
+#: wt-status.c:1311
msgid "No commands done."
msgstr "No s'ha fet cap ordre."
-#: wt-status.c:1269
+#: wt-status.c:1314
#, 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:1280
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (vegeu més en el fitxer %s)"
-#: wt-status.c:1285
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "No manca cap ordre."
-#: wt-status.c:1288
+#: wt-status.c:1333
#, 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:1296
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)"
-#: wt-status.c:1308
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
-#: wt-status.c:1313
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Actualment esteu fent «rebase»."
-#: wt-status.c:1326
+#: wt-status.c:1371
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:1328
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1330
+#: wt-status.c:1375
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:1337
+#: wt-status.c:1382
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:1341
+#: wt-status.c:1386
#, c-format
-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»."
+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:1346
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Actualment esteu dividint una comissió durant un «rebase»."
-#: wt-status.c:1349
+#: wt-status.c:1394
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\")"
+msgstr ""
+" (Una vegada que el vostre directori de treball sigui net, executeu \"git "
+"rebase --continue\")"
-#: wt-status.c:1353
+#: wt-status.c:1398
#, 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:1358
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Actualment esteu editant una comissió durant un «rebase»."
-#: wt-status.c:1361
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)"
-#: wt-status.c:1363
-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:1408
+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:1419
+#, fuzzy
+msgid "Cherry-pick currently in progress."
+msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: wt-status.c:1372
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
-#: wt-status.c:1377
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
-#: wt-status.c:1380
+#: wt-status.c:1432
+#, fuzzy
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+
+#: wt-status.c:1435
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:1382
+#: wt-status.c:1437
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:1447
+#, fuzzy
+msgid "Revert currently in progress."
+msgstr "avorta la fusió en curs actual"
-#: wt-status.c:1390
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1395
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
-#: wt-status.c:1398
+#: wt-status.c:1459
+#, fuzzy
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (arregleu els conflictes i executeu \"git revert --continue\")"
+
+#: wt-status.c:1462
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:1400
+#: wt-status.c:1464
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:1410
+#: wt-status.c:1474
#, 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:1414
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1417
+#: wt-status.c:1481
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:1617
+#: wt-status.c:1690
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1624
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
-#: wt-status.c:1626
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
-#: wt-status.c:1631
-msgid "HEAD detached at "
-msgstr "HEAD separat a "
-
-#: wt-status.c:1633
-msgid "HEAD detached from "
-msgstr "HEAD separat de "
-
-#: wt-status.c:1636
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1653
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1654
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara."
-#: wt-status.c:1668
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1670
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1674
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
"'git help status')."
-#: wt-status.c:1680
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1682
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
-#: wt-status.c:1688
+#: wt-status.c:1761
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1693
+#: wt-status.c:1766
#, 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:1696
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "no hi ha canvis afegits a cometre\n"
-#: wt-status.c:1699
+#: wt-status.c:1772
#, c-format
-msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n"
-msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add\" per a seguir-los)\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ò hi ha fitxers no seguits (useu \"git add"
+"\" per a seguir-los)\n"
-#: wt-status.c:1702
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
-#: wt-status.c:1705
+#: wt-status.c:1778
#, 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:1708 wt-status.c:1713
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "no hi ha res a cometre\n"
-#: wt-status.c:1711
+#: wt-status.c:1784
#, 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:1715
+#: wt-status.c:1788
#, 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:1828
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
-#: wt-status.c:1832
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1863
+#: wt-status.c:1936
msgid "different"
msgstr "diferent"
-#: wt-status.c:1865 wt-status.c:1873
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1868 wt-status.c:1871
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "davant per "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2386
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2392
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2394
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: builtin/add.c:270
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:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 builtin/prune-packed.c:56
-#: builtin/pull.c:214 builtin/push.c:560 builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "marxa en sec"
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
#: builtin/add.c:303
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:305
msgid "don't add, only refresh the index"
#: builtin/add.c:307
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:309 builtin/update-index.c:991
+#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
-#: builtin/add.c:380
+#: builtin/add.c:379
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:418
+#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:425
+#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-#: builtin/add.c:429
+#: builtin/add.c:430
#, 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:444
+#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:445
+#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Potser volíeu dir «git add .»?\n"
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:473
+#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:510
+#: builtin/am.c:512
#, 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»"
-#: builtin/am.c:536
+#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:724
+#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:789
+#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:837
+#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:842 builtin/am.c:854
+#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:849
+#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:942
+#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:947 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:952
+#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1082 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1096
+#: builtin/am.c:1098
#, 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:1097
+#: builtin/am.c:1099
#, 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:1098
+#: builtin/am.c:1100
#, 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:1181
+#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1209
+#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "El pedaç està buit."
-#: builtin/am.c:1275
+#: builtin/am.c:1277
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1297
+#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1493
+#: builtin/am.c:1496
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:1495
+#: builtin/am.c:1498
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:1514
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1520
+#: builtin/am.c:1523
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:1546
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1578
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1624 builtin/am.c:1628
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1644
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-
-#: builtin/am.c:1649
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1659
+#: builtin/am.c:1660
+#, c-format
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:1709
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1749 builtin/am.c:1817
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1766
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1772
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1776
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1820
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"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:1827
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as such.\n"
+"You 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 a l'índex.\n"
-"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com a tal.\n"
-"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel fitxer."
+"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com "
+"a tal.\n"
+"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel "
+"fitxer."
-#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329 builtin/reset.c:337
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:1986
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2030
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2123
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2159
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2160
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2166
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2168
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2170
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58 builtin/repack.c:306
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:307 builtin/stash.c:806
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2173
+#: builtin/am.c:2178
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:2176
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2178
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2180
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2182
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2184
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2187
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
+msgstr ""
+"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
-#: builtin/am.c:2190
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2219
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671 builtin/fmt-merge-msg.c:674 builtin/grep.c:879
-#: builtin/merge.c:240 builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062 builtin/repack.c:317
-#: builtin/repack.c:321 builtin/repack.c:323 builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
-#: parse-options.h:144 parse-options.h:146 parse-options.h:266
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/replace.c:544 builtin/tag.c:422
-#: builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2216
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2222
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2224
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2227
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2230
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2233
+#: builtin/am.c:2238
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:2236
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2239
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "mostra el pedaç que s'està aplicant."
-#: builtin/am.c:2243
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2245
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274 builtin/pull.c:185 builtin/rebase.c:1106
-#: builtin/rebase--interactive.c:185 builtin/revert.c:114 builtin/tag.c:402
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2251
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2269
+#: builtin/am.c:2274
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."
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. No l'useu més."
-#: builtin/am.c:2276
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2291
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
-msgstr "un directori de «rebase» 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:2315
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2321
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opcions>] [<pedaç>...]"
#: builtin/bisect--helper.c:26
#, fuzzy
-msgid "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:27
#, fuzzy
-msgid "git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
#: builtin/bisect--helper.c:28
#: builtin/bisect--helper.c:29
#, fuzzy
-msgid "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
#: builtin/bisect--helper.c:30
msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}=<term>][--no-checkout] [<bad> "
-"[<good>...]] [--] [<paths>...]"
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"
=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
#: builtin/bisect--helper.c:86
#: builtin/bisect--helper.c:174
#, fuzzy, c-format
-msgid "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
"No s'ha pogut agafar la HEAD original '$branch'.\n"
"Proveu 'git bisect reset <comissió>'."
#: builtin/bisect--helper.c:258
#, fuzzy, c-format
msgid "Invalid command: you're currently in a %s/%s 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."
#: builtin/bisect--helper.c:285
#, fuzzy, c-format
#: builtin/bisect--helper.c:526
#, fuzzy, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-vàlida>'."
+msgstr ""
+"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
+"vàlida>'."
#: builtin/bisect--helper.c:547
msgid "won't bisect on cg-seek'ed tree"
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorrecte - referència simbòlica estranya"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, fuzzy, c-format
+msgid "invalid ref: '%s'"
+msgstr "fitxer no vàlid: «%s»"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "realitza 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escriu els termes a .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "neteja l'estat de la bisecció"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "comprova les revisions esperades"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
#, fuzzy
msgid "reset the bisection state"
msgstr "neteja l'estat de la bisecció"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
#, fuzzy
msgid "write out the bisection state in BISECT_LOG"
msgstr "neteja l'estat de la bisecció"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
#, fuzzy
msgid "check and set terms in a bisection state"
msgstr "neteja l'estat de la bisecció"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
#, fuzzy
msgid "print out the bisect terms"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms requereix dos paràmetres"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
#, fuzzy
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
#, fuzzy
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
#, fuzzy
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
#, fuzzy
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-clean-state no accepta paràmetres"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
#, fuzzy
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--write-terms requereix dos paràmetres"
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
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:406
+#: builtin/blame.c:410
#, fuzzy, c-format
msgid "expecting a color: %s"
msgstr "respecta els colors del format"
-#: builtin/blame.c:413
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:700
+#: builtin/blame.c:730
#, fuzzy, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: builtin/blame.c:718
+#: builtin/blame.c:748
#, fuzzy
msgid "invalid value for blame.coloring"
msgstr "valor no vàlid per a --missing"
-#: builtin/blame.c:793
+#: builtin/blame.c:823
+#, fuzzy, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "no s'ha pogut resoldre la revisió: %s"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:794
+#: builtin/blame.c:846
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:795
+#: builtin/blame.c:847
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:796
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:797
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:798
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
-#: builtin/blame.c:799
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:800
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:801
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:802
+#: builtin/blame.c:854
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:803
+#: builtin/blame.c:855
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:804
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:805
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:806
+#: builtin/blame.c:858
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:807
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
-msgstr "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: desactivat)"
+msgstr ""
+"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
+"desactivat)"
-#: builtin/blame.c:808
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:809
+#: builtin/blame.c:861 builtin/log.c:1646
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+#, fuzzy
+msgid "Ignore <rev> when blaming"
+msgstr "ignora l'índex en comprovar"
+
+#: builtin/blame.c:862
+#, fuzzy
+msgid "Ignore revisions from <file>"
+msgstr "llegiu el missatge des d'un fitxer"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:810
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:817
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usa un heurístic experimental per a millorar les diferències"
-#: builtin/blame.c:819
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:820
+#: builtin/blame.c:874
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:821
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:822 builtin/blame.c:823
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:822
+#: builtin/blame.c:876
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:823
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:824
+#: builtin/blame.c:878
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:875
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "no es pot usar --progress amb els formats --incremental o de porcellana"
+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
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:926
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:1018
+#: builtin/blame.c:1087
#, 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/blame.c:1064
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, 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:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, 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:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "no s'ha trobat la branca «%s»."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error en suprimir la branca amb seguiment remot «%s»"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error en suprimir la branca «%s»"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, 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:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:59
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no s'ha pogut analitzar la cadena de format"
-#: builtin/branch.c:458
+#: builtin/branch.c:460
+#, fuzzy
+msgid "could not resolve HEAD"
+msgstr "no s'ha pogut resoldre la comissió HEAD"
+
+#: builtin/branch.c:466
+#, fuzzy, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD no trobat sota refs/heads!"
+
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:462
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:479
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "no es pot copiar branca actual mentre no s'és a cap."
-#: builtin/branch.c:481
+#: builtin/branch.c:504
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:492
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:519
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:521
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "La còpia de la branca ha fallat"
-#: builtin/branch.c:525
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
-#: builtin/branch.c:528
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:534
+#: builtin/branch.c:557
#, 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:543
+#: builtin/branch.c:566
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:545
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
-msgstr "La branca està copiada, però l'actualització del fitxer de configuració ha fallat"
+msgstr ""
+"La branca està copiada, però l'actualització del fitxer de configuració ha "
+"fallat"
-#: builtin/branch.c:561
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"S'eliminaran les línies que comencin amb «%c».\n"
-#: builtin/branch.c:594
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:596
+#: builtin/branch.c:620
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:597
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:598
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:600
+#: builtin/branch.c:624
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:602 builtin/rebase--interactive.c:182
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:602
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:603
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Desassigna la informació de font"
-#: builtin/branch.c:604
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:605
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:607 builtin/branch.c:609
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:608 builtin/branch.c:610
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:613
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:614
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:616
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:617
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:618
+#: builtin/branch.c:642
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:619
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:620
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copia una branca i el seu registre de referència"
-#: builtin/branch.c:621
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copia una branca, encara que el destí existeixi"
-#: builtin/branch.c:622
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:623
+#: builtin/branch.c:647
+#, fuzzy
+msgid "show current branch name"
+msgstr "No hi ha cap branca actual."
+
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:625
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:626
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:627
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:628
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:629
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 builtin/tag.c:415
-msgid "key"
-msgstr "clau"
-
-#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 builtin/tag.c:416
-msgid "field name to sort on"
-msgstr "nom del camp en el qual ordenar"
-
-#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:581
-#: builtin/notes.c:584 builtin/tag.c:418
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:433
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:634
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:660 builtin/clone.c:746
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:683
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:725
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:730
+#: builtin/branch.c:758
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:737
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:740
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:755
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:764
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "hi ha massa arguments per a una operació remota"
-#: builtin/branch.c:769
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "hi ha massa arguments per a establir una nova font"
-#: builtin/branch.c:773
+#: builtin/branch.c:801
#, 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:776 builtin/branch.c:799
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "no existeix la branca «%s»"
-#: builtin/branch.c:780
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branca «%s» no existeix"
-#: builtin/branch.c:793
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "hi ha massa arguments per a desassignar la font"
-#: builtin/branch.c:797
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
+msgstr ""
+"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
-#: builtin/branch.c:803
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branca «%s» no té informació de font"
-#: builtin/branch.c:813
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
+#: builtin/branch.c:841
+#, fuzzy
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:816
-msgid "the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."
-msgstr "L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-upstream-to."
+#: builtin/branch.c:845
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
+"upstream-to."
#: builtin/bundle.c:45
#, c-format
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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:594
-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:595
+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:615
+#: builtin/cat-file.c:616
#, fuzzy
msgid "only one batch option may be specified"
msgstr "Cap nom de branca especificat"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
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:642
+#: builtin/cat-file.c:643
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:643 git-submodule.sh:860
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
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:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
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:653
+#: builtin/cat-file.c:654
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:657
+#: builtin/cat-file.c:658
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:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr ""
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:21 builtin/checkout.c:1280 builtin/gc.c:517 builtin/worktree.c:496
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
#: builtin/checkout-index.c:167
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:169
msgid "don't checkout new files"
msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
-#: builtin/checkout-index.c:178 builtin/column.c:31 builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857 builtin/worktree.c:669
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "cadena"
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opcions>] <branca>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
-#: builtin/checkout.c:147 builtin/checkout.c:181
+#: builtin/checkout.c:37
+#, fuzzy
+msgid "git switch [<options>] [<branch>]"
+msgstr "git checkout [<opcions>] <branca>"
+
+#: builtin/checkout.c:42
+#, fuzzy
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "el camí «%s» no té la nostra versió"
-#: builtin/checkout.c:149 builtin/checkout.c:183
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "el camí «%s» no té la seva versió"
-#: builtin/checkout.c:165
+#: builtin/checkout.c:190
#, 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:210
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "el camí «%s» no té les versions necessàries"
-#: builtin/checkout.c:228
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí «%s»: no es pot fusionar"
-#: builtin/checkout.c:244
+#: builtin/checkout.c:274
#, 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:267 builtin/checkout.c:270 builtin/checkout.c:273 builtin/checkout.c:276
-#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "«%s» no es pot usar amb actualització de camins"
-
-#: builtin/checkout.c:279 builtin/checkout.c:282
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» no es pot usar amb %s"
-
-#: builtin/checkout.c:285
-#, 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."
-
-#: builtin/checkout.c:354 builtin/checkout.c:361
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr "el camí «%s» està sense fusionar"
-
-#: builtin/checkout.c:397
+#: builtin/checkout.c:374
#, fuzzy, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»"
msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»"
-#: builtin/checkout.c:402
+#: builtin/checkout.c:379
#, fuzzy, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
-#: builtin/checkout.c:409
+#: builtin/checkout.c:386
#, fuzzy, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "S'ha produït un error en llegir l'índex"
msgstr[1] "S'ha produït un error en llegir l'índex"
-#: builtin/checkout.c:645
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "«%s» no es pot usar amb actualització de camins"
+
+#: builtin/checkout.c:422 builtin/checkout.c:425
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "«%s» no es pot usar amb %s"
+
+#: builtin/checkout.c:429
+#, 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."
+
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr ""
+
+#: builtin/checkout.c:437
+#, fuzzy, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "«%s» no es pot usar amb «%s»"
+
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, fuzzy, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "%s: %s no es pot usar amb %s"
+
+#: builtin/checkout.c:506 builtin/checkout.c:513
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "el camí «%s» està sense fusionar"
+
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:782
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:736
+#, fuzzy, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
+"%%s"
+
+#: builtin/checkout.c:833
#, 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:824
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:828 builtin/clone.c:699
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:832
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:835
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Ja en «%s»\n"
-#: builtin/checkout.c:839
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:841 builtin/checkout.c:1212
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:843
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:900
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:919
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:951
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:983 builtin/checkout.c:1207
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1176
+#, fuzzy
+msgid "only one reference expected"
+msgstr "s'esperava només una referència, s'han donat %d."
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1140
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1182
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1221
+#: builtin/checkout.c:1303
+#, fuzzy, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
+
+#: builtin/checkout.c:1305
+#, fuzzy, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr ""
+"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, fuzzy, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+
+#: builtin/checkout.c:1309
+#, fuzzy, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "La vostra branca està al dia amb «%s».\n"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1345
+#, fuzzy
+msgid "you are switching branch while bisecting"
+msgstr "Actualment esteu bisecant."
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1224 builtin/checkout.c:1228
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240 builtin/checkout.c:1243
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1248
+#: builtin/checkout.c:1380
+#, fuzzy, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "«%s» no es pot usar amb actualització de camins"
+
+#: builtin/checkout.c:1388
#, 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:1281 builtin/checkout.c:1283 builtin/clone.c:120 builtin/remote.c:169 builtin/remote.c:171
-#: builtin/worktree.c:489 builtin/worktree.c:491
-msgid "branch"
-msgstr "branca"
+#: builtin/checkout.c:1395
+#, fuzzy
+msgid "missing branch or commit argument"
+msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1282
-msgid "create and checkout a new branch"
-msgstr "crea i agafa una branca nova"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1284
-msgid "create/reset and checkout a branch"
-msgstr "crea/restableix i agafa una branca"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1285
-msgid "create reflog for new branch"
-msgstr "crea un registre de referència per a la branca nova"
+#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+msgid "style"
+msgstr "estil"
-#: builtin/checkout.c:1286 builtin/worktree.c:493
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "estil de conflicte (fusió o diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1287
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "agafa a la força (descarta qualsevol modificació local)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1291
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "actualitza els fitxers ignorats (per defecte)"
+
+#: builtin/checkout.c:1462
+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:1475
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1296
-msgid "force checkout (throw away local modifications)"
-msgstr "agafa a la força (descarta qualsevol modificació local)"
-
-#: builtin/checkout.c:1298
-msgid "perform a 3-way merge with the new branch"
-msgstr "realitza una fusió de 3 vies amb la branca nova"
-
-#: builtin/checkout.c:1300 builtin/merge.c:276
-msgid "update ignored files (default)"
-msgstr "actualitza els fitxers ignorats (per defecte)"
-
-#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
-msgid "style"
-msgstr "estil"
-
-#: builtin/checkout.c:1303
-msgid "conflict style (merge or diff3)"
-msgstr "estil de conflicte (fusió o diff3)"
-
-#: builtin/checkout.c:1306
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1308
-#, fuzzy
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "dubta 'git checkout <cap-branca-així>'"
-
-#: builtin/checkout.c:1310
-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:1314 builtin/clone.c:87 builtin/fetch.c:141 builtin/merge.c:273 builtin/pull.c:130
-#: builtin/push.c:575 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "força l'informe de progrés"
-
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mútuament excloents"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1536
+#, fuzzy
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-n i -k són mútuament excloents."
+
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1367
+#: builtin/checkout.c:1578
#, fuzzy
msgid "missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1404
+#: builtin/checkout.c:1611
+#, fuzzy, c-format
+msgid "could not resolve %s"
+msgstr "no s'ha pogut resoldre «%s»"
+
+#: builtin/checkout.c:1623
+#, fuzzy
+msgid "you must specify path(s) to restore"
+msgstr "Heu d'especificar un directori."
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta comissió"
+msgstr ""
+"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
+"comissió"
-#: builtin/checkout.c:1415
+#: builtin/checkout.c:1642
#, 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:1419
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
"agafar de l'índex."
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branca"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crea i agafa una branca nova"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crea/restableix i agafa una branca"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crea un registre de referència per a la branca nova"
+
+#: builtin/checkout.c:1697
+#, fuzzy
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "dubta 'git checkout <cap-branca-així>'"
+
+#: builtin/checkout.c:1698
+#, fuzzy
+msgid "use overlay mode (default)"
+msgstr "poda les referències soltes (per defecte)"
+
+#: builtin/checkout.c:1734
+#, fuzzy
+msgid "create and switch to a new branch"
+msgstr "crea i agafa una branca nova"
+
+#: builtin/checkout.c:1736
+#, fuzzy
+msgid "create/reset and switch to a branch"
+msgstr "crea/restableix i agafa una branca"
+
+#: builtin/checkout.c:1738
+#, fuzzy
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "dubta 'git checkout <cap-branca-així>'"
+
+#: builtin/checkout.c:1740
+#, fuzzy
+msgid "throw away local modifications"
+msgstr "agafa a la força (descarta qualsevol modificació local)"
+
+#: builtin/checkout.c:1772
+#, fuzzy
+msgid "where the checkout from"
+msgstr "llegeix l'objecte des de stdin"
+
+#: builtin/checkout.c:1774
+#, fuzzy
+msgid "restore the index"
+msgstr "S'ha produït un error en llegir l'índex"
+
+#: builtin/checkout.c:1776
+#, fuzzy
+msgid "restore the working tree (default)"
+msgstr "Mostra l'estat de l'arbre de treball"
+
+#: builtin/checkout.c:1778
+#, fuzzy
+msgid "ignore unmerged entries"
+msgstr "s'està ignorant %s no fusionat\n"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr ""
+
#: builtin/clean.c:28
-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>..."
+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:32
#, c-format
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, fuzzy, c-format
+msgid "could not lstat %s\n"
+msgstr "no s'ha pogut fer stat a %s"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554 git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, 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:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Adéu.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminaria l'ítem següent:"
msgstr[1] "Eliminaria els ítems següents:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "força"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 builtin/grep.c:897 builtin/log.c:167
-#: builtin/log.c:169 builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417 builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:939
-msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; refusant netejar"
+#: builtin/clean.c:940
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
+"refusant netejar"
-#: builtin/clean.c:942
-msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; refusant netejar"
+#: builtin/clean.c:943
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
+"refusant netejar"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:89
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:94
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:100
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:102 builtin/clone.c:106
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "especificació de camí"
-#: builtin/clone.c:102 builtin/clone.c:106
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:109
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:110 builtin/init-db.c:478
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:111 builtin/init-db.c:479
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:117 builtin/submodule--helper.c:1381 builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 builtin/pack-objects.c:3303 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3308 builtin/repack.c:330
msgid "name"
msgstr "nom"
-#: builtin/clone.c:119
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:121
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc de la HEAD del remot"
-#: builtin/clone.c:123
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836 builtin/pull.c:218
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:125
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
msgid "time"
msgstr "hora"
-#: builtin/clone.c:127
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169 builtin/rebase.c:1039
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:129 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:133
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
+msgstr ""
+"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
-#: builtin/clone.c:135
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:136 builtin/init-db.c:487
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:137 builtin/init-db.c:488
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:138
+#: builtin/clone.c:139
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231 builtin/push.c:586
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "específic al servidor"
+
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "opció a transmetre"
+
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234 builtin/push.c:588
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+#, fuzzy
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualsevol submòdul clonat serà superficial"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"No s'ha pogut endevinar cap nom de directori.\n"
"Especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, 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:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:427
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "s'ha produït un error en fer stat a '%s'\n"
+#: builtin/clone.c:428
+#, fuzzy, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, 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:479
+#: builtin/clone.c:467
+#, fuzzy, c-format
+msgid "failed to iterate over '%s'"
+msgstr "s'ha produït un error en eliminar «%s»"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
+#, fuzzy
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"El clonatge ha tingut èxit, però l'agafament ha\n"
"fallat. Podeu inspeccionar què s'ha agafat amb\n"
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, 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:687
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:737
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut agafar.\n"
+msgstr ""
+"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
+"agafar.\n"
-#: builtin/clone.c:768
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:813
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:876
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:878
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:918 builtin/receive-pack.c:1941
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:922
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:935
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:938
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:951
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit «%s» no existeix"
-#: builtin/clone.c:957 builtin/fetch.c:1608
+#: builtin/clone.c:977 builtin/fetch.c:1653
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:967
+#: builtin/clone.c:987
#, 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:977
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272 builtin/worktree.c:296 builtin/worktree.c:326
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:997
+#: builtin/clone.c:1017
#, 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:1017
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu «%s»...\n"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1043
-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:1063
+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:1104
+#: builtin/clone.c:1124
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:1106
+#: builtin/clone.c:1126
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:1108
+#: builtin/clone.c:1128
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:1110
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1113
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1118
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1192 builtin/clone.c:1200
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, 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:1203
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
msgid "--command must be the first argument"
msgstr "--command ha de ser el primer paràmetre"
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, fuzzy, c-format
+msgid "duplicate parent %s ignored"
+msgstr "suprimeix les referències reemplaçades"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
+#, fuzzy, c-format
+msgid "not a valid object name %s"
+msgstr "no és un nom d'objecte vàlid: %s"
+
+#: builtin/commit-tree.c:93
+#, fuzzy, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
+
+#: builtin/commit-tree.c:96
+#, fuzzy, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: builtin/commit-tree.c:98
+#, fuzzy, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
+#: builtin/commit-tree.c:111
+#, fuzzy
+msgid "parent"
+msgstr "pare"
+
+#: builtin/commit-tree.c:112
+#, fuzzy
+msgid "id of a parent commit object"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
+msgstr "missatge"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
+msgstr "missatge de comissió"
+
+#: builtin/commit-tree.c:118
+#, fuzzy
+msgid "read commit log message from file"
+msgstr "llegiu el missatge des d'un fitxer"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "signa la comissió amb GPG"
+
+#: builtin/commit-tree.c:133
+#, fuzzy
+msgid "must give exactly one tree"
+msgstr "Cal exactament un rang."
+
+#: builtin/commit-tree.c:140
+#, fuzzy
+msgid "git commit-tree: failed to read"
+msgstr "git write-tree ha fallat en escriure un arbre"
+
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
" 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:63
-msgid "Otherwise, please use 'git reset'\n"
+#, fuzzy
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "D'altra manera, useu «git reset»\n"
#: builtin/commit.c:66
msgid ""
-"If you wish to skip this commit, use:\n"
+"and then use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr ""
-"Si voleu ometre aquesta comissió, useu:\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Llavors \"git cherry-pick --continue\" reprendrà\n"
-"com a «cherry pick» les comissions restants.\n"
+msgstr ""
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
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:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
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:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:652
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:701 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, 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:703
+#: builtin/commit.c:708
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:707
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:736 builtin/commit.c:744
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:741
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:795
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:813
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:818
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:847
#, 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 ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies començant amb «%c», i un missatge de\n"
+"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n"
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
+"vosaltres\n"
"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:856
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:864
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:871
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:956
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:970 builtin/tag.c:258
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1014
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1028
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "mode ignorat no vàlid «%s»"
-#: builtin/commit.c:1042 builtin/commit.c:1279
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1080
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1113
+#: builtin/commit.c:1146
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:1122
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1125
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1127
+#: builtin/commit.c:1160
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:1130
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1140
+#: builtin/commit.c:1173
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:1142
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
-#: builtin/commit.c:1150
+#: builtin/commit.c:1183
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:1167
+#: builtin/commit.c:1200
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:1169
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1183 builtin/tag.c:546
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Mode de neteja no vàlid %s"
-
-#: builtin/commit.c:1188
-msgid "Paths with -a does not make sense."
+#: builtin/commit.c:1208
+#, fuzzy, c-format
+msgid "paths '%s ...' with -a does not make sense"
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1314 builtin/commit.c:1498
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1316 builtin/commit.c:1500
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1318
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1320 builtin/commit.c:1502
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1322
+#: builtin/commit.c:1347
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561 builtin/worktree.c:640
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512 builtin/fast-export.c:1085
-#: builtin/fast-export.c:1088 builtin/rebase.c:1118 builtin/tag.c:400
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1331 builtin/commit.c:1512
+#: builtin/commit.c:1356 builtin/commit.c:1537
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:1335
-msgid "show ignored files, optional modes: traditional, matching, no. (Default: traditional)"
+#: builtin/commit.c:1360
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. (Per defecte: traditional, matching, no.)"
+"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
+"(Per defecte: traditional, matching, no.)"
-#: builtin/commit.c:1337 parse-options.h:164
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1338
-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:1363
+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:1340
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1341
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "no detectis canvis de noms"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
-#: builtin/commit.c:1363
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1468
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1469
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1471
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1498
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1474 builtin/gc.c:518
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "data"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409 builtin/notes.c:575 builtin/tag.c:395
-msgid "message"
-msgstr "missatge"
-
-#: builtin/commit.c:1475
-msgid "commit message"
-msgstr "missatge de comissió"
-
-#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478 builtin/commit.c:1479 parse-options.h:278
-#: ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1477
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1503
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:1479
+#: builtin/commit.c:1504
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:1480
+#: builtin/commit.c:1505
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:1481 builtin/log.c:1533 builtin/merge.c:277 builtin/pull.c:156 builtin/revert.c:107
+#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1484
-msgid "default"
-msgstr "per defecte"
-
-#: builtin/commit.c:1484 builtin/tag.c:401
-msgid "how to strip spaces and #comments from message"
-msgstr "com suprimir els espais i #comentaris del missatge"
-
-#: builtin/commit.c:1485
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186 builtin/revert.c:115
-msgid "GPG sign commit"
-msgstr "signa la comissió amb GPG"
-
-#: builtin/commit.c:1490
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1491
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1492
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1493
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evita els lligams de precomissió i missatge de comissió"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1617
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1649
#, 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:1633
+#: builtin/commit.c:1654
#, 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:1668
+#: builtin/commit.c:1688
+#, fuzzy
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"s'ha actualitzat el dipòsit, però no es pot escriure el\n"
"fitxer new_index. Comproveu que el disc no estigui ple i\n"
"que no s'hagi excedit la quota, i després feu \n"
"«git reset HEAD» per a recuperar-ho."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid "git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 builtin/commit-graph.c:132 builtin/commit-graph.c:190
-#: builtin/fetch.c:153 builtin/log.c:1553
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1601
msgid "dir"
msgstr "directori"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 builtin/commit-graph.c:133 builtin/commit-graph.c:191
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:135
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#, fuzzy, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
+
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:137
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:139
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:141
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:172
+#, fuzzy
+msgid "allow writing an incremental commit-graph file"
+msgstr "Escriu i verifica els fitxers commit-graph de Git"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
msgid "git config [<options>]"
msgstr "git config [<opcions>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "paràmetre --type no reconegut, %s"
#: builtin/config.c:136
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:137
msgid "add a new variable: name value"
msgid "Type"
msgstr "Tipus"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "el valor té donat aquest tipus"
#: builtin/config.c:157
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:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valor"
#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
-msgstr "s'ha produït un error en formatar el valor per defecte de la configuració: %s"
+msgstr ""
+"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
#: builtin/config.c:401
#, c-format
#: builtin/config.c:611
msgid "only one config file at a time"
-msgstr ""
+msgstr "només un fitxer de configuració cada cop"
#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--name-only només és aplicable a --list o --get-regexp"
#: builtin/config.c:712
-msgid "--show-origin is only applicable to --get, --get-all, --get-regexp, and --list"
-msgstr "--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "no hi ha compatibilitat per a l'edició a stdin"
#: builtin/config.c:746
-#, fuzzy
msgid "editing blobs is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+msgstr "no hi ha compatibilitat per l'edició de blobs"
#: builtin/config.c:760
#, c-format
msgid "describe %s\n"
msgstr "descriu %s\n"
-#: builtin/describe.c:513 builtin/log.c:516
+#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:551 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:364
+#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:408
+#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:417
+#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "s'ha donat més de dos blobs: «%s»"
-#: builtin/diff.c:422
+#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat «%s»."
-#: builtin/difftool.c:31
+#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:261
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:305
+#: builtin/difftool.c:297
#, 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:313
+#: builtin/difftool.c:305
#, 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:414
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"els formats de diff combinats ('-c' and '--cc') no són admesos \n"
"en el mode diff per directoris ('-d' and '--dir-diff')."
-#: builtin/difftool.c:634
+#: 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:636
+#: 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:647
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a «%s»."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:701
+#: 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:706
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:699
msgid "tool"
msgstr "eina"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:702
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:713
-msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code"
-msgstr "fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida diferent de zero"
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de "
+"sortida diferent de zero"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
-msgstr "especifiqueu una ordre personalitzada per veure diffs"
+msgstr "especifiqueu un ordre personalitzat per veure diffs"
+
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr "passa-ho a «diff»"
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool requereix worktree o --no-index"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff és incompatible amb --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool and --extcmd són mútuament excloents"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
-#: builtin/difftool.c:747
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipus"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:1089
-msgid "select handling of tags that tag filtered objects"
+#: builtin/fast-export.c:1129
+msgid "select handling of tags that tag filtered objects"
+msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
+
+#: builtin/fast-export.c:1132
+#, fuzzy
+msgid "select handling of commit messages in an alternate encoding"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1102 builtin/log.c:1601
+#: builtin/fast-export.c:1145 builtin/log.c:1649
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:115 builtin/pull.c:195
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:117 builtin/pull.c:198
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:119 builtin/pull.c:201
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "força la sobreescriptura de la referència local"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:124 builtin/pull.c:205
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:130 builtin/pull.c:208
+#: builtin/fetch.c:140 builtin/pull.c:216
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:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:138 builtin/pull.c:216
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "aprofundeix la història d'un clon superficial basat en temps"
-#: builtin/fetch.c:151 builtin/pull.c:222
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:157
-msgid "default for recursive fetching of submodules (lower priority than config files)"
-msgstr "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que els fitxers de configuració)"
+#: builtin/fetch.c:167
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
+"els fitxers de configuració)"
-#: builtin/fetch.c:161 builtin/pull.c:225
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:163 builtin/pull.c:228
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "específic al servidor"
+#: builtin/fetch.c:180
+msgid "report that we have only objects reachable from this object"
+msgstr ""
-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "opció a transmetre"
+#: builtin/fetch.c:183
+#, fuzzy
+msgid "run 'gc --auto' after fetching"
+msgstr "poda els remots després d'obtenir-los"
-#: builtin/fetch.c:170
-msgid "report that we have only objects reachable from this object"
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:469
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, 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:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:879
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:900
#, 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:959 builtin/fetch.c:1081
+#: builtin/fetch.c:991 builtin/fetch.c:1124
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1002
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1008
+msgid ""
+"Fetch normally indicates which branches had a forced update, but that check "
+"has been disabled."
+msgstr ""
+
+#: builtin/fetch.c:1009
+msgid ""
+"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
+"showForcedUpdates true'."
+msgstr ""
+
+#: builtin/fetch.c:1011
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
+"updates'\n"
+msgstr ""
+
+#: builtin/fetch.c:1013
+msgid ""
+"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+msgstr ""
+
+#: builtin/fetch.c:1094
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1095
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1127
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1128 builtin/remote.c:1036
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1151
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1170
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1173
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
-msgstr "S'ignora l'opció \"%s\" per a %s\n"
+msgstr "S'ignora l'opció «%s» per a %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1477
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1479 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1482
-msgid "--filter can only be used with the remote configured in extensions.partialClone"
+#: builtin/fetch.c:1525
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1549
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1586
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1637
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1639
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1644
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1646
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1662
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1664
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1628
+#: builtin/fetch.c:1673
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existeix un remot ni un grup remot: %s"
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1680
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
-#: builtin/fetch.c:1651
-msgid "--filter can only be used with the remote configured in extensions.partialclone"
+#: builtin/fetch.c:1696
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
#: builtin/fmt-merge-msg.c:18
-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>]"
+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:672
msgid "populate log with at most <n> entries from shortlog"
#: 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: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:30
msgid "quote placeholders suitably for perl"
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:39 builtin/tag.c:424
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respecta els colors del format"
-#: builtin/for-each-ref.c:43
+#: 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:45
+#: 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:46
+#: 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:47
+#: 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:48
+#: 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ó"
" to %7s %s"
msgstr ""
-#: builtin/fsck.c:253
+#: builtin/fsck.c:295
#, c-format
msgid "missing %s %s"
msgstr "manca %s %s"
-#: builtin/fsck.c:279
-#, fuzzy, c-format
+#: builtin/fsck.c:321
+#, c-format
msgid "unreachable %s %s"
-msgstr "ja es té %s (%s)"
+msgstr "inabastable %s %s"
-#: builtin/fsck.c:298
+#: builtin/fsck.c:340
#, fuzzy, c-format
msgid "dangling %s %s"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/fsck.c:307
+#: builtin/fsck.c:349
#, fuzzy
msgid "could not create lost-found"
msgstr "no s'ha pogut crear el fitxer «%s»"
-#: builtin/fsck.c:318
+#: builtin/fsck.c:360
#, c-format
msgid "could not finish '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
-#: builtin/fsck.c:335
+#: builtin/fsck.c:377
#, c-format
msgid "Checking %s"
msgstr "S'està comprovant %s"
-#: builtin/fsck.c:353
+#: builtin/fsck.c:415
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "S'està comprovant la connectivitat (%d objectes)"
-#: builtin/fsck.c:372
+#: builtin/fsck.c:434
#, c-format
msgid "Checking %s %s"
msgstr "S'està comprovant %s %s"
-#: builtin/fsck.c:376
+#: builtin/fsck.c:438
msgid "broken links"
msgstr "enllaços trencats"
-#: builtin/fsck.c:385
+#: builtin/fsck.c:447
#, c-format
msgid "root %s"
msgstr "arrel %s"
-#: builtin/fsck.c:393
+#: builtin/fsck.c:455
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/fsck.c:422
+#: builtin/fsck.c:484
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecte corrupte o no trobat"
-#: builtin/fsck.c:447
-#, fuzzy, c-format
+#: builtin/fsck.c:509
+#, c-format
msgid "%s: invalid reflog entry %s"
-msgstr "referència no vàlida: %s"
+msgstr " %s: entrada de referència no vàlida %s"
-#: builtin/fsck.c:461
+#: builtin/fsck.c:523
#, fuzzy, c-format
msgid "Checking reflog %s->%s"
msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/fsck.c:495
+#: builtin/fsck.c:557
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: punter sha1 no vàlid: %s"
-#: builtin/fsck.c:502
+#: builtin/fsck.c:564
#, c-format
msgid "%s: not a commit"
msgstr "%s: no és una comissió"
-#: builtin/fsck.c:557
-#, fuzzy
+#: builtin/fsck.c:619
msgid "notice: No default references"
-msgstr "no s'han pogut suprimir les referències: %s"
+msgstr "avís: no hi ha referències per defecte"
-#: builtin/fsck.c:572
+#: builtin/fsck.c:634
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objecte corrupte o no trobat: %s"
-#: builtin/fsck.c:585
+#: builtin/fsck.c:647
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
-#: builtin/fsck.c:605
-#, fuzzy, c-format
+#: builtin/fsck.c:667
+#, c-format
msgid "bad sha1 file: %s"
-msgstr "línia de shallow no vàlida: %s"
+msgstr "fitxer sha1 malmès: %s"
-#: builtin/fsck.c:620
+#: builtin/fsck.c:682
msgid "Checking object directory"
msgstr "S'està comprovant el directori d'objecte"
-#: builtin/fsck.c:623
+#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:638
+#: builtin/fsck.c:700
#, c-format
msgid "Checking %s link"
msgstr "S'està comprovant l'enllaç %s"
-#: builtin/fsck.c:643 builtin/index-pack.c:833
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/fsck.c:650
+#: builtin/fsck.c:712
#, fuzzy, c-format
msgid "%s points to something strange (%s)"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:718
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:660
+#: builtin/fsck.c:722
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:672
-#, fuzzy
+#: builtin/fsck.c:734
msgid "Checking cache tree"
-msgstr "S'està comprovant el pedaç %s..."
+msgstr "S'està comprovant l'arbre de la memòria cau"
-#: builtin/fsck.c:677
+#: builtin/fsck.c:739
#, fuzzy, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
-#: builtin/fsck.c:688
+#: builtin/fsck.c:750
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:719
+#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:726
+#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:727
+#: builtin/fsck.c:789
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:728
+#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:730
+#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:731
+#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:732
+#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:733
+#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:735
+#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:736 builtin/prune.c:110
+#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:737
+#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:797
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/fsck.c:825
+#: builtin/fsck.c:887
#, fuzzy, c-format
msgid "%s: object missing"
msgstr "mostra la mida de l'objecte"
-#: builtin/fsck.c:837
+#: builtin/fsck.c:899
#, fuzzy, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
msgid "Failed to fstat %s: %s"
msgstr "S'ha produït un error en fer fstat %s: %s"
-#: builtin/gc.c:461 builtin/init-db.c:55
+#: builtin/gc.c:126
+#, fuzzy, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "s'ha produït un error en moure «%s» a «%s»"
+
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
-#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
-#: builtin/gc.c:477
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
-#: builtin/gc.c:519
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:521
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:522
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:525
+#: builtin/gc.c:546
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:528
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:545
+#: builtin/gc.c:566
#, fuzzy, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:556
+#: builtin/gc.c:577
#, fuzzy, c-format
msgid "failed to parse prune expiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:597
#, 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 rerefons per a un "
+"rendiment òptim.\n"
-#: builtin/gc.c:578
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
+msgstr ""
+"S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n"
-#: builtin/gc.c:579
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Vegeu \"git help gc\" per neteja manual.\n"
+msgstr "Vegeu «git help gc» per a neteja manual.\n"
-#: builtin/gc.c:619
+#: builtin/gc.c:640
#, 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:672
-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:695
+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:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697 builtin/pack-objects.c:2717
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2722
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, 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:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
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:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "cerca als subdirectories (per defecte)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "mostra el nombre de columna de la primera coincidència"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
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:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "mostra només les parts de coincidents de la línia"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
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:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
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:880
+#: builtin/grep.c:882
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:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
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:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
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:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "no s'ha donat cap patró"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3400
+#: builtin/grep.c:1068 builtin/pack-objects.c:3405
msgid "no threads support, ignoring --threads"
msgstr "no hi ha suport de fils, s'està ignorant --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
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:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opció no admesa amb --recurse-submodules."
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
#, fuzzy
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:1135
+#: builtin/grep.c:1137
#, fuzzy
msgid "both --cached and trees are given"
msgstr "s'han donat ambdós --caches i arbres."
#: builtin/hash-object.c:85
-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>..."
+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>..."
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "tipus"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipus d'objecte"
msgstr "emmagatzema el fitxer tal com és sense filtres"
#: builtin/hash-object.c:104
-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"
+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:105
msgid "process file as it were from this path"
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
-#: builtin/help.c:73
+#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'ajuda no reconegut «%s»"
-#: builtin/help.c:100
+#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
-#: builtin/help.c:113
+#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
-#: builtin/help.c:121
+#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:217
+#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"«%s»: camí a un visualitzador de manuals no compatible.\n"
"Considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:229
+#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"«%s»: ordre per a un visualitzador de manuals compatible.\n"
"Considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:346
+#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:363
+#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:371
+#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:430 builtin/help.c:441 git.c:323
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:444 git.c:347
+#: builtin/help.c:448 git.c:365
#, fuzzy, c-format
msgid "bad alias.%s string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/help.c:473 builtin/help.c:503
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/help.c:487
+#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
-#: builtin/index-pack.c:249
+#: builtin/index-pack.c:258
#, 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:259
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:260
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:279 builtin/pack-objects.c:599
+#: builtin/index-pack.c:288 builtin/pack-objects.c:600
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:282 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
-#: builtin/index-pack.c:297 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no es pot obrir el fitxer de paquet «%s»"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:319
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:457
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:506
+#: builtin/index-pack.c:515
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:514
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
-msgstr "no es pot fer pread en el fitxer de paquet"
+msgstr "no es pot fer pread en el fitxer empaquetat"
-#: builtin/index-pack.c:555
+#: builtin/index-pack.c:564
#, c-format
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[0] "el final del fitxer empaquetat és prematur, manca %<PRIuMAX> octet"
+msgstr[1] ""
+"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:581
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 builtin/index-pack.c:794
-#: builtin/index-pack.c:803
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:729 builtin/pack-objects.c:152 builtin/pack-objects.c:212 builtin/pack-objects.c:306
+#: builtin/index-pack.c:738 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:792
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:817 builtin/index-pack.c:836
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
#, fuzzy
msgid "fsck error in packed object"
msgstr "ignora els objectes empaquetats"
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:847
#, 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:910 builtin/index-pack.c:941
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1109
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1143
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1186
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1237
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1243
+#: builtin/index-pack.c:1252
#, 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:1255
+#: builtin/index-pack.c:1264
#, 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:1259
+#: builtin/index-pack.c:1268
#, 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:1283
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1360
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1402
#, 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:1399
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no es pot escriure «%s» al fitxer «%s»"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1435
#, fuzzy, c-format
msgid "cannot close written %s file '%s'"
msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
-msgstr "error en tancar el fitxer de paquet"
+msgstr "error en tancar el fitxer empaquetat"
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
-msgstr "no es pot emmagatzemar el fitxer de paquet"
+msgstr "no es pot emmagatzemar el fitxer empaquetat"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> incorrecte"
-#: builtin/index-pack.c:1565
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent «%s»"
+msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
-#: builtin/index-pack.c:1567
+#: builtin/index-pack.c:1595
#, 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:1615
+#: builtin/index-pack.c:1643
#, 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:1622
+#: builtin/index-pack.c:1650
#, 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:1659
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un dipòsit git"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
#, fuzzy
msgid "fsck error in pack objects"
msgstr "error en objecte: %s"
msgid "not copying templates from '%s': %s"
msgstr "no s'estan copiant plantilles de «%s»: %s"
-#: builtin/init-db.c:329
+#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
-#: builtin/init-db.c:332
+#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/init-db.c:349 builtin/init-db.c:352
+#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s ja existeix"
-#: builtin/init-db.c:405
+#: builtin/init-db.c:413
#, 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:406
+#: builtin/init-db.c:414
#, 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:410
+#: builtin/init-db.c:418
#, 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:411
+#: builtin/init-db.c:419
#, 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:460
-msgid "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--shared[=<permisos>]] [<directori>]"
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
+"shared[=<permisos>]] [<directori>]"
-#: builtin/init-db.c:483
+#: builtin/init-db.c:491
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:484
+#: builtin/init-db.c:492
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:518 builtin/init-db.c:523
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "no es pot mkdir %s"
-#: builtin/init-db.c:527
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "no es pot canviar de directori a %s"
-#: builtin/init-db.c:548
+#: builtin/init-db.c:559
#, 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>)"
+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>)"
-#: builtin/init-db.c:576
+#: builtin/init-db.c:587
#, 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>...]"
-msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <testimoni>[(=|:)<valor>])...] [<fitxer>...]"
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "edita els fitxers in situ"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "escurça els remolcs buits"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "on ubica"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "acció si el «trailer» ja existeix"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "acció si el «trailer» falta"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "mostra només els «trailer»"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "no apliquis les regles de configuració"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "uneix els valors continus amb espais en blanc"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "estableix les opcions d'anàlisi"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "remolc"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "remolcs a afegir"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer amb --only-input no té sentit"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:100
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:163
-msgid "suppress diff output"
-msgstr "omet la sortida de diferències"
+#: builtin/log.c:160
+msgid ""
+"log.mailmap is not set; its implicit value will change in an\n"
+"upcoming release. To squelch this message and preserve current\n"
+"behaviour, set the log.mailmap configuration value to false.\n"
+"\n"
+"To squelch this message and adopt the new behaviour now, set the\n"
+"log.mailmap configuration value to true.\n"
+"\n"
+"See 'git help config' and search for 'log.mailmap' for further information."
+msgstr ""
-#: builtin/log.c:164
+#: builtin/log.c:183
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:165
+#: builtin/log.c:184
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:167
+#: builtin/log.c:186
msgid "only decorate refs that match <pattern>"
msgstr "només decora les referències que coincideixin amb <patró>"
-#: builtin/log.c:169
+#: builtin/log.c:188
msgid "do not decorate refs that match <pattern>"
msgstr "no decoris les referències que coincideixen amb <patró>"
-#: builtin/log.c:170
+#: builtin/log.c:189
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:173
+#: builtin/log.c:192
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:271
+#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:525
+#: builtin/log.c:551
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:540 builtin/log.c:634
-#, c-format
-msgid "Could not read object %s"
+#: builtin/log.c:566 builtin/log.c:660
+#, fuzzy, c-format
+msgid "could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:659
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/log.c:685
+#, fuzzy, c-format
+msgid "unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:780
+#: builtin/log.c:808
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:881
+#: builtin/log.c:925
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:897
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/log.c:941
+#, fuzzy, c-format
+msgid "cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:914
-msgid "Need exactly one range."
+#: builtin/log.c:958
+#, fuzzy
+msgid "need exactly one range"
msgstr "Cal exactament un rang."
-#: builtin/log.c:924
-msgid "Not a range."
+#: builtin/log.c:968
+#, fuzzy
+msgid "not a range"
msgstr "No és un rang."
-#: builtin/log.c:1047
-msgid "Cover letter needs email format"
+#: builtin/log.c:1091
+#, fuzzy
+msgid "cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1132
+#: builtin/log.c:1097
+#, fuzzy
+msgid "failed to create cover-letter file"
+msgstr "S'ha produït un error en crear els fitxers de sortida"
+
+#: builtin/log.c:1176
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1159
+#: builtin/log.c:1203
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1217
-msgid "Two output directories?"
+#: builtin/log.c:1261
+#, fuzzy
+msgid "two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#, fuzzy, c-format
+msgid "unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
+#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, 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."
+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:1339
-msgid "Could not find exact merge base."
+#: builtin/log.c:1387
+#, fuzzy
+msgid "could not find exact merge base"
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1343
+#: builtin/log.c:1391
+#, fuzzy
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"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, 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:1363
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1411
+#, fuzzy
+msgid "failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
-#: builtin/log.c:1374
+#: builtin/log.c:1422
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:1378
+#: builtin/log.c:1426
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:1431
+#: builtin/log.c:1479
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1483
+#: builtin/log.c:1531
#, fuzzy
msgid "failed to infer range-diff ranges"
msgstr "s'ha produït un error en executar «%s»"
-#: builtin/log.c:1528
+#: builtin/log.c:1576
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:1531
+#: builtin/log.c:1579
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1535
+#: builtin/log.c:1583
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1537
+#: builtin/log.c:1585
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1539
+#: builtin/log.c:1587
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:1540
+#: builtin/log.c:1588
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1541
+#: builtin/log.c:1589
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1543
+#: builtin/log.c:1591
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:1545
+#: builtin/log.c:1593
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1547
+#: builtin/log.c:1595
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1550
+#: builtin/log.c:1598
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1553
+#: builtin/log.c:1601
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1556
+#: builtin/log.c:1604
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1559
+#: builtin/log.c:1607
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1561
+#: builtin/log.c:1609
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1563
+#: builtin/log.c:1611
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:1565
+#: builtin/log.c:1613
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:1567
+#: builtin/log.c:1615
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1568
+#: builtin/log.c:1616
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1569
+#: builtin/log.c:1617
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1570 builtin/log.c:1572
+#: builtin/log.c:1618 builtin/log.c:1620
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1570
+#: builtin/log.c:1618
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1572
+#: builtin/log.c:1620
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1574
+#: builtin/log.c:1622
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1575
+#: builtin/log.c:1623
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:1577
+#: builtin/log.c:1625
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1578
+#: builtin/log.c:1626
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:1579 builtin/log.c:1582
+#: builtin/log.c:1627 builtin/log.c:1630
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1580
+#: builtin/log.c:1628
msgid "attach the patch"
msgstr "adjunta el pedaç"
-#: builtin/log.c:1583
+#: builtin/log.c:1631
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1587
+#: builtin/log.c:1635
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1589
+#: builtin/log.c:1637
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1590
+#: builtin/log.c:1638
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1591
+#: builtin/log.c:1639
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1592
+#: builtin/log.c:1640
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
-#: builtin/log.c:1594
+#: builtin/log.c:1642
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1595
+#: builtin/log.c:1643
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1597
+#: builtin/log.c:1645
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
-#: builtin/log.c:1598
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1599
+#: builtin/log.c:1647
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1602
+#: builtin/log.c:1650
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1604
+#: builtin/log.c:1652
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1679
+#: builtin/log.c:1727
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1694
+#: builtin/log.c:1742
#, fuzzy
msgid "-n and -k are mutually exclusive"
msgstr "-n i -k són mútuament excloents."
-#: builtin/log.c:1696
+#: builtin/log.c:1744
#, fuzzy
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc i -k són mútuament excloents."
-#: builtin/log.c:1704
+#: builtin/log.c:1752
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1706
+#: builtin/log.c:1754
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1708
+#: builtin/log.c:1756
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1740
+#: builtin/log.c:1788
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1742
-#, c-format
-msgid "Could not create directory '%s'"
-msgstr "No s'ha pogut crear el directori «%s»"
-
-#: builtin/log.c:1829
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1833
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1834
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1840
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1844
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1852
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1853
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1864
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:1900
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
-#: builtin/log.c:1944
-msgid "Failed to create output files"
+#: builtin/log.c:1992
+#, fuzzy
+msgid "failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
-#: builtin/log.c:2003
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:2057
+#: builtin/log.c:2105
#, c-format
-msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> manualment.\n"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
+"manualment.\n"
#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
#: builtin/ls-files.c:532
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:534
msgid "show deleted files in the output"
#: builtin/ls-files.c:577
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:579
msgid "show debugging data"
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "executable"
msgid "take url.<base>.insteadOf into account"
msgstr "tingues en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:73
+#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
-#: builtin/ls-remote.c:76
+#: builtin/ls-remote.c:75
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:145
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/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
-#: builtin/merge.c:53
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:54
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:55
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:112
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "l'opció «m» requereix un valor"
-#: builtin/merge.c:132
+#: builtin/merge.c:141
#, fuzzy, c-format
msgid "option `%s' requires a value"
msgstr "l'opció «%s» requereix un valor"
-#: builtin/merge.c:178
+#: builtin/merge.c:187
#, 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:179
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:184
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:235 builtin/pull.c:144
+#: builtin/merge.c:244 builtin/pull.c:151
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:238 builtin/pull.c:147
+#: builtin/merge.c:247 builtin/pull.c:154
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:239 builtin/pull.c:150
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:241 builtin/pull.c:153
+#: builtin/merge.c:250 builtin/pull.c:160
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:244 builtin/pull.c:159
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:246 builtin/pull.c:162
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:248 builtin/pull.c:165
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:249
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:251 builtin/pull.c:171
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:255 builtin/pull.c:174
+#: builtin/merge.c:265 builtin/pull.c:182
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:256 builtin/notes.c:787 builtin/pull.c:178 builtin/rebase.c:1124 builtin/rebase--interactive.c:188
-#: builtin/revert.c:111
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:257 builtin/pull.c:179
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:259 builtin/pull.c:183
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:261
+#: builtin/merge.c:271
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:268
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:270
+#: builtin/merge.c:280
+#, fuzzy
+msgid "--abort but leave index and working tree alone"
+msgstr "restableix HEAD, l'índex i l'arbre de treball"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:272 builtin/pull.c:190
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:278
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verifica el lligam de missatge de comissió"
-#: builtin/merge.c:303
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:308
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:313
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:335 builtin/merge.c:352
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:382
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
-#: builtin/merge.c:393
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:443
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:494
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:581
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c:702
+#: builtin/merge.c:708
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:716
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
-#: builtin/merge.c:731
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:783
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:792
+#: builtin/merge.c:798
#, 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:798
-#, c-format
+#: builtin/merge.c:804
+#, fuzzy
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
msgstr ""
"Introduïu un missatge de comissió per a explicar per què\n"
"aquesta fusió és necessària, especialment si fusiona una font\n"
"S'ignoraran les línies que comencin amb «%c», i un missatge buit\n"
"avorta la comissió.\n"
-#: builtin/merge.c:834
+#: builtin/merge.c:809
+#, fuzzy
+msgid "An empty message aborts the commit.\n"
+msgstr "edita el missatge abans de cometre"
+
+#: builtin/merge.c:812
+#, fuzzy, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
+"comissió buit avorta la comissió.\n"
+
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:853
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:906
+#: builtin/merge.c:933
#, 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:945
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:947
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:949
+#: builtin/merge.c:976
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:954
+#: builtin/merge.c:981
#, 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:1011
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-#: builtin/merge.c:1114
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1148
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1251
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
-#: builtin/merge.c:1255
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1267
+#: builtin/merge.c:1291
+#, fuzzy
+msgid "--quit expects no arguments"
+msgstr "--abort no accepta paràmetres"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
-#: builtin/merge.c:1271
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-#: builtin/merge.c:1287
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1294
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1297
+#: builtin/merge.c:1334
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:1306
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1314
+#: builtin/merge.c:1350
+#, fuzzy
+msgid "You cannot combine --squash with --commit."
+msgstr "No podeu combinar --squash amb --no-ff."
+
+#: builtin/merge.c:1366
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:1331
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1333
+#: builtin/merge.c:1385
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:1338
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1340
+#: builtin/merge.c:1392
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:1422
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1431
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1441
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1532
#, 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:1490
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1521
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1544 builtin/merge.c:1623
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1548
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1614
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1616
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1625
+#: builtin/merge.c:1660
#, 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:1637
+#: builtin/merge.c:1672
#, 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:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
#: builtin/merge-base.c:161
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:9
-msgid "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>"
+msgid ""
+"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>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
msgid "allow creation of more than one tree"
msgstr "permet la creació de més d'un arbre"
-#: builtin/multi-pack-index.c:8
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
msgstr ""
-#: builtin/multi-pack-index.c:21
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:39
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "hi ha massa paràmetres"
-#: builtin/multi-pack-index.c:48
-#, c-format
-msgid "unrecognized verb: %s"
-msgstr "paràmetre no reconegut: %s"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:61
+#, fuzzy, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subordre desconeguda: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos per a procedir"
+msgstr ""
+"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
+"per a procedir"
#: builtin/mv.c:103
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:413
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "imprimeix només els noms (sense SHA-1)"
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "només usa les etiquetes per a anomenar les comissions"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "només usa les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignora les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "llista totes les comissions abastables de totes les referències"
-#: builtin/name-rev.c:421
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "llegeix de stdin"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "permet imprimir els noms `undefined` (per defecte)"
-#: builtin/name-rev.c:428
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
#: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
+msgid ""
+"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:30
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:31
-msgid "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
+msgid ""
+"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:32
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:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
#: builtin/notes.c:34
-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>"
+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>"
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
-msgstr "especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
+msgstr ""
+"especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
#: builtin/notes.c:206
msgid "unable to write note object"
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:242 builtin/tag.c:513
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "no s'ha pogut obrir o llegir «%s»"
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 builtin/notes.c:383 builtin/notes.c:438
-#: builtin/notes.c:526 builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, 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."
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:376 builtin/notes.c:431 builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598
-#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
msgid "too many parameters"
msgstr "massa paràmetres"
#: builtin/notes.c:448
#, 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:463 builtin/notes.c:544
#, c-format
#: builtin/notes.c:499
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:517
msgid "too few parameters"
#: builtin/notes.c:538
#, 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:550
#, c-format
#: builtin/notes.c:702
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:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Opcions de fusió"
#: builtin/notes.c:788
-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)"
+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)"
#: builtin/notes.c:790
msgid "Committing unmerged notes"
#: builtin/notes.c:876
#, 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:878
#, 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:897 builtin/tag.c:545
+#, 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:900
#, c-format
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1034
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:51
-msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < <llista-de-objectes>]"
-
#: builtin/pack-objects.c:52
-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>]"
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
+"<llista-de-objectes>]"
+
+#: builtin/pack-objects.c:53
+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>]"
-#: builtin/pack-objects.c:423
+#: builtin/pack-objects.c:424
#, fuzzy, c-format
msgid "bad packed object CRC for %s"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:434
+#: builtin/pack-objects.c:435
#, fuzzy, c-format
msgid "corrupt packed object for %s"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:565
+#: builtin/pack-objects.c:566
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
#, fuzzy, c-format
msgid "packfile is invalid: %s"
msgstr "%s no vàlid"
-#: builtin/pack-objects.c:793
+#: builtin/pack-objects.c:794
#, fuzzy, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/pack-objects.c:797
+#: builtin/pack-objects.c:798
#, fuzzy
msgid "unable to seek in reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/pack-objects.c:808
+#: builtin/pack-objects.c:809
#, fuzzy
msgid "unable to read from reused packfile"
msgstr "no es pot llegir el fitxer d'índex"
-#: builtin/pack-objects.c:836
+#: builtin/pack-objects.c:837
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"
+msgstr ""
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
+"a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:849
+#: builtin/pack-objects.c:850
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:911 builtin/update-index.c:89
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "s'ha produït un error en fer stat a %s"
-#: builtin/pack-objects.c:964
+#: builtin/pack-objects.c:965
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1158
+#: builtin/pack-objects.c:1161
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:1586
+#: builtin/pack-objects.c:1591
#, fuzzy, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/pack-objects.c:1595
+#: builtin/pack-objects.c:1600
#, fuzzy, c-format
msgid "delta base offset out of bound for %s"
msgstr "el desplaçament de base de diferències està fora de límits"
-#: builtin/pack-objects.c:1864
+#: builtin/pack-objects.c:1869
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
-#: builtin/pack-objects.c:1994
+#: builtin/pack-objects.c:1999
#, fuzzy, c-format
msgid "unable to get size of %s"
msgstr "no s'ha pogut moure %s a %s"
-#: builtin/pack-objects.c:2009
+#: builtin/pack-objects.c:2014
#, fuzzy, c-format
msgid "unable to parse object header of %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095 builtin/pack-objects.c:2105
+#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
+#: builtin/pack-objects.c:2110
#, fuzzy, c-format
msgid "object %s cannot be read"
msgstr "objecte %s no trobat"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2119
+#: builtin/pack-objects.c:2124
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2445
+#: builtin/pack-objects.c:2450
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2577
+#: builtin/pack-objects.c:2582
#, fuzzy, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:2664
+#: builtin/pack-objects.c:2669
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2675
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2756
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2757
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2855
+#: builtin/pack-objects.c:2860
msgid "invalid value for --missing"
msgstr "valor no vàlid per a --missing"
-#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
#, fuzzy
msgid "cannot open pack index"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/pack-objects.c:2945
+#: builtin/pack-objects.c:2950
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3030
+#: builtin/pack-objects.c:3035
#, fuzzy
msgid "unable to force loose object"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3127
#, fuzzy, c-format
msgid "not a rev '%s'"
msgstr "no es pot llegir «%s»"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3130
#, c-format
msgid "bad revision '%s'"
msgstr "revisió incorrecte «%s»"
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3155
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
-#: builtin/pack-objects.c:3203
+#: builtin/pack-objects.c:3208
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:3207
+#: builtin/pack-objects.c:3212
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3242
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:3239
+#: builtin/pack-objects.c:3244
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:3241
+#: builtin/pack-objects.c:3246
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:3244
+#: builtin/pack-objects.c:3249
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:3245
+#: builtin/pack-objects.c:3250
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3251
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:3249
+#: builtin/pack-objects.c:3254
msgid "maximum size of each output pack file"
-msgstr "mida màxima de cada fitxer de paquet de sortida"
+msgstr "mida màxima de cada fitxer empaquetat de sortida"
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3256
msgid "ignore borrowed objects from alternate object store"
msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:3253
+#: builtin/pack-objects.c:3258
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3260
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3262
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:3259
+#: builtin/pack-objects.c:3264
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:3261
+#: builtin/pack-objects.c:3266
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3268
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:3265
+#: builtin/pack-objects.c:3270
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3272
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:3269
+#: builtin/pack-objects.c:3274
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:3271
+#: builtin/pack-objects.c:3276
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3278
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:3276
+#: builtin/pack-objects.c:3281
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3284
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:3282
+#: builtin/pack-objects.c:3287
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3290
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3292
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:3289
+#: builtin/pack-objects.c:3294
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3296
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3298
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3301
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3303
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3305
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3307
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3309
#, fuzzy
msgid "ignore this pack"
msgstr "usa el paquet prim"
-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3311
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3313
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:3310
+#: builtin/pack-objects.c:3315
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:3312
+#: builtin/pack-objects.c:3317
msgid "write a bitmap index together with the pack index"
msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3320
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3323
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3320
+#: builtin/pack-objects.c:3325
#, fuzzy
msgid "respect islands during delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3350
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:3355
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3409
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3411
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3416
#, fuzzy
msgid "--thin cannot be used to build an indexable pack"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3419
#, fuzzy
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3425
#, fuzzy
msgid "cannot use --filter without --stdout"
msgstr "no es pot usar -a amb -d"
-#: builtin/pack-objects.c:3479
+#: builtin/pack-objects.c:3486
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3516
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències %<PRIu32>)"
+msgstr ""
+"Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències "
+"%<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opcions>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "empaqueta-ho tot"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
-#: builtin/prune.c:109
+#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "informa d'objectes podats"
-#: builtin/prune.c:112
+#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "fes caducar els objectes més vells que <hora>"
-#: builtin/prune.c:114
+#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:128
+#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "no es pot podar en un dipòsit d'objectes preciosos"
-#: builtin/pull.c:61 builtin/pull.c:63
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valor no vàlid per a %s: %s"
-#: builtin/pull.c:83
+#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/pull.c:134
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/pull.c:138
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:141
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:177
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
-msgstr "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
+msgstr ""
+"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-#: builtin/pull.c:193
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:203
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/pull.c:211
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:306
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:422
-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:433
+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:424
-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:435
+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:425
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:428
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"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:433 builtin/rebase.c:956 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
-#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:438 builtin/pull.c:453
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455 builtin/rebase.c:962 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460 git-legacy-rebase.sh:564 git-parse-remote.sh:65
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 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:457 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:468 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:462
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:566
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "no s'ha pogut accedir a la comissió %s"
-#: builtin/pull.c:844
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:892
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:900
+#: builtin/pull.c:924
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:904
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:905
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:930
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:936
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"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:951
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:955
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:962
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "no es pot fer «rebase» amb modificacions als submòduls enregistrades localment"
+msgstr ""
+"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
+"localment"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
"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:170
#, c-format
#: builtin/push.c:207
#, 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:210
#, c-format
"quina branca remota."
#: builtin/push.c:269
-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\"."
+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:276
msgid ""
#: builtin/push.c:295
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:298
msgid ""
#: builtin/push.c:399
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"
" 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"
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "programa que rep els paquets"
msgid "use simple diff colors"
msgstr "utilitza colors simples de diff"
-#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "cap .. en rang: «%s»"
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "el format de l'argument únic ha de ser de rang simètric"
-#: builtin/range-diff.c:90
+#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "calen dos rangs de comissió"
#: builtin/read-tree.c:41
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=<gitignore>] | -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:124
msgid "write resulting index to <file>"
msgid "debug unpack-trees"
msgstr "depura unpack-trees"
-#: builtin/rebase.c:30
+#: builtin/read-tree.c:157
#, fuzzy
-msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]"
-msgstr "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> [<camí>...]"
+msgid "suppress feedback messages"
+msgstr "omet els missatges informatius"
#: builtin/rebase.c:32
-msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+#, fuzzy
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
+"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
+"[<camí>...]"
#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:121 builtin/rebase.c:1437
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "llista per a fer inestable: «%s»"
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr "no s'ha pogut escriure a «%s»."
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr "no hi ha cap HEAD?"
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr "no s'ha pogut crear el fitxer temporal %s"
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr "no s'ha pogut marcar com a interactiu"
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr "no s'ha pogut generar la llista per a fer"
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<opcions>]"
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "mantén les comissions buides"
+
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr "fes «rebase» de les comissions de fusió"
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr "signa les comissions"
+
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "continua el «rebase»"
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr "omet la comissió"
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr "edita la llista a fer"
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr "mostra el pedaç actual"
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "escurça els ids de les comissions en la llista per a fer"
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "expandeix els ids de les comissions en la llista per a fer"
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "comprova la llista a fer"
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "reorganitza les línies «fixup/pick»"
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "expandeix les ordres exec en la llista per a fer"
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+#, fuzzy
+msgid "restrict-revision"
+msgstr "revisió"
+
+#: builtin/rebase.c:481
+#, fuzzy
+msgid "restrict revision"
+msgstr "revisió"
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+#, fuzzy
+msgid "the upstream commit"
+msgstr "Desassigna la informació de font"
+
+#: builtin/rebase.c:488
+#, fuzzy
+msgid "head-name"
+msgstr "canvi de nom"
+
+#: builtin/rebase.c:488
+#, fuzzy
+msgid "head name"
+msgstr "davant per "
+
+#: builtin/rebase.c:493
+#, fuzzy
+msgid "rebase strategy"
+msgstr "estratègia de fusió"
+
+#: builtin/rebase.c:494
+#, fuzzy
+msgid "strategy-opts"
+msgstr "estratègia"
+
+#: builtin/rebase.c:495
+#, fuzzy
+msgid "strategy options"
+msgstr "opcions de decoració"
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+#, fuzzy
+msgid "onto-name"
+msgstr "nom"
+
+#: builtin/rebase.c:498
+#, fuzzy
+msgid "onto name"
+msgstr "nom del remot"
+
+#: builtin/rebase.c:499
+#, fuzzy
+msgid "cmd"
+msgstr "ordre"
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr "l'ordre a executar"
+
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requereix un «rebase» interactiu"
-#: builtin/rebase.c:173
+#: builtin/rebase.c:586
#, fuzzy, c-format
msgid "could not get 'onto': '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: builtin/rebase.c:188
+#: builtin/rebase.c:601
#, fuzzy, c-format
msgid "invalid orig-head: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: builtin/rebase.c:213
+#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:289
+#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "No s'ha pogut llegir «%s»"
-#: builtin/rebase.c:307
+#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "No es pot emmagatzemar %s"
-#: builtin/rebase.c:402
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "no s'ha pogut determinar la revisió de HEAD"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --continue».\n"
+"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --"
+"continue».\n"
"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
+"executeu «git rebase --abort»."
-#: builtin/rebase.c:603
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:948
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<branca>'\n"
"\n"
-#: builtin/rebase.c:964
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:\n"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
+"amb:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:994
+#: builtin/rebase.c:1364
#, fuzzy
msgid "exec commands cannot contain newlines"
msgstr "expandeix les ordres exec en la llista per a fer"
-#: builtin/rebase.c:998
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1040
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
-#: builtin/rebase.c:1042
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
-#: builtin/rebase.c:1044
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
-#: builtin/rebase.c:1047
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:1050
+#: builtin/rebase.c:1406
#, fuzzy
msgid "do not show diffstat of what changed upstream"
msgstr "no mostris les estadístiques de diferència al final de la fusió"
-#: builtin/rebase.c:1053
+#: builtin/rebase.c:1409
#, fuzzy
msgid "add a Signed-off-by: line to each commit"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passa-ho a «git am»"
-#: builtin/rebase.c:1063 builtin/rebase.c:1065
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passa-ho a «git-apply»"
-#: builtin/rebase.c:1067 builtin/rebase.c:1070
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
-#: builtin/rebase.c:1072
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1075
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
-#: builtin/rebase.c:1077
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
-#: builtin/rebase.c:1080
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
-#: builtin/rebase.c:1081
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
-#: builtin/rebase.c:1084
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "mostra el pedaç que s'està aplicant o fusionant"
-#: builtin/rebase.c:1087
+#: builtin/rebase.c:1443
#, fuzzy
msgid "use merging strategies to rebase"
msgstr "estratègia de fusió a usar"
-#: builtin/rebase.c:1091
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1095
-msgid "try to recreate merges instead of ignoring them"
+#: builtin/rebase.c:1451
+#, fuzzy
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "intenta recrear les "
-#: builtin/rebase.c:1099
-msgid "allow rerere to update index with resolved conflict"
-msgstr ""
-
-#: builtin/rebase.c:1102
+#: builtin/rebase.c:1455
#, fuzzy
msgid "preserve empty commits during rebase"
msgstr "preserva les comissions inicialment buides"
-#: builtin/rebase.c:1104
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1110
+#: builtin/rebase.c:1463
#, fuzzy
msgid "automatically stash/stash pop before and after"
-msgstr "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
+msgstr ""
+"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-#: builtin/rebase.c:1112
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1116
+#: builtin/rebase.c:1469
#, fuzzy
msgid "allow rebasing commits with empty messages"
msgstr "permet les comissions amb missatges buits"
-#: builtin/rebase.c:1119
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1122
+#: builtin/rebase.c:1475
#, fuzzy
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
-msgstr "utiliza l'estratègia de fusió donada"
+msgstr "utilitza l'estratègia de fusió donada"
-#: builtin/rebase.c:1126 builtin/revert.c:112
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opció"
-#: builtin/rebase.c:1127
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
-msgstr "passa l'argument a l'estratègia de fussió"
+msgstr "passa l'argument a l'estratègia de fusió"
-#: builtin/rebase.c:1130
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins l'arrel"
-#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
-msgid "automatically re-schedule any `exec` that fails"
+#: builtin/rebase.c:1500
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:1149
-#, c-format
-msgid "could not exec %s"
-msgstr "no s'ha pogut executar %s"
-
-#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
-#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1547
+#, fuzzy
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: builtin/rebase.c:1257
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
-#: builtin/rebase.c:1276
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
-#: builtin/rebase.c:1287 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir «%s»"
-
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1673
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: builtin/rebase.c:1334
-#, fuzzy
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
-msgstr "l'opció «c» espera un valor numèric"
+msgstr "«switch» «c» espera un valor numèric"
-#: builtin/rebase.c:1375
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
-#: builtin/rebase.c:1397
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
-#: builtin/rebase.c:1446
+#: builtin/rebase.c:1797
+#, fuzzy
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--strategy requereix --merge o --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1828
#, fuzzy
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
+#: builtin/rebase.c:1832
#, fuzzy
-msgid "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1838
#, fuzzy
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-#: builtin/rebase.c:1478
+#: builtin/rebase.c:1841
#, fuzzy
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
-#: builtin/rebase.c:1502
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
-#: builtin/rebase.c:1508
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "no s'ha pogut crear una comissió arrel nova"
-#: builtin/rebase.c:1526
+#: builtin/rebase.c:1889
#, fuzzy, c-format
msgid "'%s': need exactly one merge base"
msgstr "Cal exactament un rang."
-#: builtin/rebase.c:1533
+#: builtin/rebase.c:1896
#, fuzzy, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: builtin/rebase.c:1558
+#: builtin/rebase.c:1921
#, fuzzy, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: builtin/rebase.c:1566 builtin/submodule--helper.c:38 builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1940
#, fuzzy
msgid "Could not resolve HEAD to a revision"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: builtin/rebase.c:1622
+#: builtin/rebase.c:1984
#, fuzzy, c-format
msgid "Unexpected stash response: '%s'"
msgstr "final de fitxer inesperat"
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1990
#, fuzzy, c-format
msgid "Could not create directory for '%s'"
msgstr "No s'ha pogut crear el directori «%s»"
-#: builtin/rebase.c:1631
+#: builtin/rebase.c:1993
#, fuzzy, c-format
msgid "Created autostash: %s\n"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: builtin/rebase.c:1634
+#: builtin/rebase.c:1996
#, fuzzy
msgid "could not reset --hard"
msgstr "No s'ha pogut llegir orig-head"
-#: builtin/rebase.c:1635 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
-#: builtin/rebase.c:1678
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "no s'ha pogut analitzar «%s»"
-#: builtin/rebase.c:1691
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "no s'ha pogut commutar a %s"
-#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
-#, sh-format
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branca actual %s està al dia.\n"
-#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
-#, sh-format
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "La branca actual està al dia, «rebase» forçat."
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
-#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Canvis a %s:\n"
-#: builtin/rebase.c:1732
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Canvis de %s a %s:\n"
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt...\n"
+msgstr ""
+"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
+"damunt...\n"
-#: builtin/rebase.c:1765
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "No s'ha pogut separar HEAD"
-#: builtin/rebase.c:1774
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avanç ràpid %s a %s.\n"
-#: builtin/rebase--interactive.c:25
-msgid "no HEAD?"
-msgstr "no hi ha cap HEAD?"
-
-#: builtin/rebase--interactive.c:52
-#, c-format
-msgid "could not create temporary %s"
-msgstr "no s'ha pogut crear el fitxer temporal %s"
-
-#: builtin/rebase--interactive.c:58
-msgid "could not mark as interactive"
-msgstr "no s'ha pogut marcar com a interactiu"
-
-#: builtin/rebase--interactive.c:102
-#, c-format
-msgid "could not open %s"
-msgstr "no s'ha pogut obrir «%s»"
-
-#: builtin/rebase--interactive.c:115
-msgid "could not generate todo list"
-msgstr "no s'ha pogut generar la llista per a fer"
-
-#: builtin/rebase--interactive.c:131
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcions>]"
-
-#: builtin/rebase--interactive.c:150
-msgid "keep empty commits"
-msgstr "mantén les comissions buides"
-
-#: builtin/rebase--interactive.c:152 builtin/revert.c:125
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
-#: builtin/rebase--interactive.c:153
-#, fuzzy
-msgid "rebase merge commits"
-msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-
-#: builtin/rebase--interactive.c:155
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase--interactive.c:157
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase--interactive.c:158
-msgid "sign commits"
-msgstr "signa les comissions"
-
-#: builtin/rebase--interactive.c:160
-msgid "continue rebase"
-msgstr "continua el «rebase»"
-
-#: builtin/rebase--interactive.c:162
-msgid "skip commit"
-msgstr "omet la comissió"
-
-#: builtin/rebase--interactive.c:163
-msgid "edit the todo list"
-msgstr "edita la llista a fer"
-
-#: builtin/rebase--interactive.c:165
-msgid "show the current patch"
-msgstr "mostra el pedaç actual"
-
-#: builtin/rebase--interactive.c:168
-msgid "shorten commit ids in the todo list"
-msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase--interactive.c:170
-msgid "expand commit ids in the todo list"
-msgstr "expandeix els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase--interactive.c:172
-msgid "check the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase--interactive.c:174
-msgid "rearrange fixup/squash lines"
-msgstr "reorganitza les línies «fixup/pick»"
-
-#: builtin/rebase--interactive.c:176
-msgid "insert exec commands in todo list"
-msgstr "expandeix les ordres exec en la llista per a fer"
-
-#: builtin/rebase--interactive.c:177
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:179
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisió"
-
-#: builtin/rebase--interactive.c:179
-#, fuzzy
-msgid "restrict revision"
-msgstr "revisió"
-
-#: builtin/rebase--interactive.c:180
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:181
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase--interactive.c:183
-#, fuzzy
-msgid "the upstream commit"
-msgstr "Desassigna la informació de font"
-
-#: builtin/rebase--interactive.c:184
-#, fuzzy
-msgid "head-name"
-msgstr "canvi de nom"
-
-#: builtin/rebase--interactive.c:184
-#, fuzzy
-msgid "head name"
-msgstr "davant per "
-
-#: builtin/rebase--interactive.c:189
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratègia de fusió"
-
-#: builtin/rebase--interactive.c:190
-#, fuzzy
-msgid "strategy-opts"
-msgstr "estratègia"
-
-#: builtin/rebase--interactive.c:191
-#, fuzzy
-msgid "strategy options"
-msgstr "opcions de decoració"
-
-#: builtin/rebase--interactive.c:192
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase--interactive.c:193
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase--interactive.c:194
-#, fuzzy
-msgid "onto-name"
-msgstr "nom"
-
-#: builtin/rebase--interactive.c:194
-#, fuzzy
-msgid "onto name"
-msgstr "nom del remot"
-
-#: builtin/rebase--interactive.c:195
-#, fuzzy
-msgid "cmd"
-msgstr "ordre"
-
-#: builtin/rebase--interactive.c:195
-#, fuzzy
-msgid "the command to run"
-msgstr "No s'ha fet cap ordre."
-
-#: builtin/rebase--interactive.c:224
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase--interactive.c:230
-msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
-
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:832
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"
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
-#: builtin/receive-pack.c:1929
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1943
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--rewrite] [--updateref] [--stale-fix] [--dry-"
-"run | -n] [--verbose] [--all] <refs>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
msgstr ""
#: builtin/reflog.c:22
-msgid "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>..."
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
msgstr ""
#: builtin/reflog.c:25
msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
#: builtin/reflog.c:755
-#, fuzzy, c-format
+#, c-format
msgid "invalid ref format: %s"
-msgstr "format de data no vàlid: %s"
+msgstr "format de referència no vàlid: %s"
#: builtin/reflog.c:764
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:17
-msgid "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>"
+msgid ""
+"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>"
#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote prune [-n | --dry-run] <nom>"
#: builtin/remote.c:23
-msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
#: builtin/remote.c:187
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:194 builtin/remote.c:636
#, c-format
#: builtin/remote.c:344
#, 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:443 builtin/remote.c:451
msgid "(matching)"
"\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"
"\tActualitzeu la configuració manualment si és necessari."
"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:816
#: builtin/remote.c:1183
#, c-format
-msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr " Branca de HEAD (la HEAD remot és ambigua, 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 (la HEAD remot és ambigua, pot ser un dels següents):\n"
#: builtin/remote.c:1195
#, c-format
#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
#: builtin/remote.c:1641
#, c-format
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Els reempaquetaments incrementals són incompatibles amb els índexs de bitmaps. Useu\n"
-"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
+"Els reempaquetaments incrementals són incompatibles amb els índexs de "
+"bitmaps. Useu\n"
+"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
+"writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:239 builtin/repack.c:411
+#: builtin/repack.c:240 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:256
+#: builtin/repack.c:257
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:295
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:296
+#: builtin/repack.c:297
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:299
+#: builtin/repack.c:300
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:302
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:306
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
#, fuzzy
msgid "pass --delta-islands to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:314
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
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:316
+#: builtin/repack.c:317
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
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:319 builtin/repack.c:325
+#: builtin/repack.c:320 builtin/repack.c:326
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
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:322
+#: builtin/repack.c:323
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
-#: builtin/repack.c:324
+#: builtin/repack.c:325
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
-#: builtin/repack.c:326
+#: builtin/repack.c:327
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:328
+#: builtin/repack.c:329
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:331
#, fuzzy
msgid "do not repack this pack"
msgstr "crea paquets prims"
-#: builtin/repack.c:340
+#: builtin/repack.c:341
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
-#: builtin/repack.c:344
+#: builtin/repack.c:345
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:420
+#: builtin/repack.c:427
#, fuzzy
msgid "Nothing new to pack."
msgstr "usa el paquet prim"
-#: builtin/repack.c:481
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
-#: builtin/repack.c:529
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "s'ha produït un error en eliminar «%s»"
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<patró>]]"
-#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
-#, 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/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, fuzzy, c-format
msgid "replace ref '%s' not found"
msgstr "no s'ha trobat la branca «%s»."
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, fuzzy, c-format
msgid "Deleted replace ref '%s'"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, fuzzy, c-format
msgid "'%s' is not a valid ref name"
msgstr "«%s» no és un nom de remot vàlid"
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, fuzzy, c-format
msgid "replace ref '%s' already exists"
msgstr "el destí «%s» ja existeix"
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, fuzzy, c-format
msgid "unable to open %s for writing"
msgstr "No s'ha pogut obrir «%s» per a escriptura"
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, fuzzy, c-format
msgid "unable to open %s for reading"
msgstr "no s'ha pogut obrir o llegir %s"
-#: builtin/replace.c:268
+#: builtin/replace.c:272
#, fuzzy
msgid "unable to spawn mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/replace.c:272
+#: builtin/replace.c:276
#, fuzzy
msgid "unable to read from mktree"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/replace.c:281
+#: builtin/replace.c:285
#, fuzzy
msgid "mktree reported failure"
msgstr "la reversió ha fallat"
-#: builtin/replace.c:285
+#: builtin/replace.c:289
#, fuzzy
msgid "mktree did not return an object name"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, fuzzy, c-format
msgid "unable to fstat %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/replace.c:299
+#: builtin/replace.c:303
#, fuzzy
msgid "unable to write object to database"
msgstr "no s'ha pogut escriure l'objecte de nota"
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, fuzzy, c-format
msgid "not a valid object name: '%s'"
msgstr "No és un nom d'objecte vàlid: «%s»"
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, fuzzy, c-format
msgid "unable to get object type for %s"
msgstr "no es pot fer grep des d'un objecte de tipus %s"
-#: builtin/replace.c:338
+#: builtin/replace.c:342
#, fuzzy
msgid "editing object file failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, fuzzy, c-format
+msgid "could not parse %s as a commit"
+msgstr "no s'ha pogut analitzar la comissió HEAD"
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "etiqueta de fusió mal formada en la comissió «%s»"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, c-format
-msgid "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"
+msgid ""
+"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"
-#: builtin/replace.c:460
-#, fuzzy, c-format
+#: builtin/replace.c:467
+#, c-format
msgid "the original commit '%s' has a gpg signature"
-msgstr "la comissió original «%s» té una signatura gpg."
+msgstr "la comissió original «%s» té una signatura gpg"
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, 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:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
-msgstr ""
+msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
-#: builtin/replace.c:515
+#: builtin/replace.c:525
#, fuzzy, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr "Eliminaria l'ítem següent:"
-#: builtin/replace.c:536
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "llista les referències reemplaçades"
-#: builtin/replace.c:537
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:538
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "edita un objecte existent"
-#: builtin/replace.c:539
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "canvia les mares d'una comissió"
-#: builtin/replace.c:540
+#: builtin/replace.c:550
#, fuzzy
msgid "convert existing graft file"
msgstr "força la sobreescriptura de fitxers existents"
-#: builtin/replace.c:541
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
-#: builtin/replace.c:543
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
-#: builtin/replace.c:544
+#: builtin/replace.c:554
msgid "use this format"
msgstr "usa aquest format"
-#: builtin/replace.c:557
+#: builtin/replace.c:567
#, fuzzy
msgid "--format cannot be used when not listing"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/replace.c:565
+#: builtin/replace.c:575
#, fuzzy
msgid "-f only makes sense when writing a replacement"
msgstr "-z només té sentit amb --stdin"
-#: builtin/replace.c:569
-#, fuzzy
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
-msgstr "-z només té sentit amb --stdin"
+msgstr "--raw només té sentit amb --edit"
-#: builtin/replace.c:575
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:581
+#: builtin/replace.c:591
msgid "bad number of arguments"
-msgstr ""
+msgstr "nombre incorrecte d'arguments"
-#: builtin/replace.c:587
-#, fuzzy
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
-msgstr "Cal exactament un rang."
+msgstr "-e necessita exactament un argument"
-#: builtin/replace.c:593
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
-msgstr ""
+msgstr "-g necessita almenys un argument"
-#: builtin/replace.c:599
-#, fuzzy
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
-msgstr "--continue no accepta paràmetres"
+msgstr "--convert-graft-file arguments"
-#: builtin/replace.c:605
-#, fuzzy
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
-msgstr "combina els patrons especificats amb -e"
+msgstr "només es pot especificar un patró amb -l"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
#: builtin/rerere.c:113
-#, fuzzy, c-format
+#, c-format
msgid "unable to generate diff for '%s'"
-msgstr "s'ha produït un error en executar «%s»"
+msgstr "s'ha pogut generar el diff per a «%s»"
#: builtin/reset.c:32
-msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
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:293
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:352
+#: builtin/reset.c:353
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:354
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:364
+#: builtin/reset.c:370
#, 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:368
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:388
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:391
+#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:401
+#: builtin/reset.c:408
#, 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:405
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:406
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
+msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "el filtratge d'objectes requereix --objects"
-#: builtin/rev-list.c:467
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valor parcial no vàlid: «%s»"
-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-list.c:511
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
" 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:24
msgid "git revert [<options>] <commit-ish>..."
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s no es pot usar amb %s"
-#: builtin/revert.c:101
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "acaba la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:102
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "reprèn la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:103
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
-#: builtin/revert.c:104
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "omet la comissió actual i continua"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "no cometis automàticament"
-#: builtin/revert.c:105
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "edita el missatge de comissió"
-#: builtin/revert.c:108
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "número del pare"
-#: builtin/revert.c:109
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "selecciona la línia principal del pare"
-#: builtin/revert.c:111
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "estratègia de fusió"
-#: builtin/revert.c:113
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opció d'estratègia de fusió"
-#: builtin/revert.c:122
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "nom de la comissió a annexar"
-#: builtin/revert.c:124
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "preserva les comissions inicialment buides"
-#: builtin/revert.c:126
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:220
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:233
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
#: builtin/rm.c:289
#, fuzzy
msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos per a procedir"
+msgstr ""
+"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
+"per a procedir"
#: builtin/rm.c:307
#, c-format
#: builtin/send-pack.c:20
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 mútuament excloents."
#: builtin/send-pack.c:163
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<opcions>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-
-#: builtin/serve.c:19
-#, fuzzy
-msgid "exit immediately after advertising capabilities"
-msgstr "surt immediatament després de l'anunci inicial de referència"
-
#: builtin/shortlog.c:14
#, fuzzy
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
#: builtin/shortlog.c:268
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:270
msgid "Show the email address of each author"
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:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "no hi ha referències coincidents amb %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "mostra les branques amb seguiment remot i les locals"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "mostra les branques amb seguiment remot"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "colora '*!+-' corresponent a la branca"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "mostra <n> comissions després de l'avantpassat comú"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinònim de more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "omet anomenar cadenes"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inclou la branca actual"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "anomena les comissions amb els seus noms d'objecte"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mostra les bases de fusió possibles"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "mostra les referències inabastables de qualsevol altra referència"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "mostra les comissions en ordre topològic"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
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:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "mostra les fusions abastables de només una punta"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
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:712
-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:711
+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:736
+#: builtin/show-branch.c:735
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:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "l'opció --reflog necessita un nom de branca"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "no hi ha tal referència %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, 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:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» no és una referència vàlida."
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no es pot trobar la comissió %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
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:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patró>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "mostra només les etiquetes (es pot combinar amb heads)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "mostra només els caps (es pot combinar amb tags)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
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:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostra la referència HEAD, encara que es filtrés"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "desreferencia les etiquetes a ID d'objecte"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "mostra el hash SHA1 usant només <n> xifres"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
+#: builtin/stash.c:22 builtin/stash.c:37
+#, fuzzy
+msgid "git stash list [<options>]"
+msgstr "git worktree list [<opcions>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+#, fuzzy
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git remote show [<opcions>] <nom>"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:26 builtin/stash.c:62
+#, fuzzy
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: builtin/stash.c:127
+#, fuzzy, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'$args' no és una comissió de tipus magatzem"
+
+#: builtin/stash.c:147
+#, fuzzy, c-format
+msgid "Too many revisions specified:%s"
+msgstr "S'han especificat massa revisions: $REV"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "No s'ha trobat cap «stash»."
+
+#: builtin/stash.c:175
+#, fuzzy, c-format
+msgid "%s is not a valid reference"
+msgstr "«%s» no és un nom de remot vàlid"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear amb paràmetres no està implementat"
+
+#: builtin/stash.c:403
+#, fuzzy
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "No es pot aplicar un magatzem enmig d'una fusió"
+
+#: builtin/stash.c:414
+#, fuzzy, c-format
+msgid "could not generate diff %s^!."
+msgstr "no s'ha pogut generar la llista per a fer"
+
+#: builtin/stash.c:421
+#, fuzzy
+msgid "conflicts in index.Try without --index."
+msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
+
+#: builtin/stash.c:427
+#, fuzzy
+msgid "could not save index tree"
+msgstr "No s'ha pogut desar l'arbre d'índex"
+
+#: builtin/stash.c:434
+#, fuzzy
+msgid "could not restore untracked files from stash"
+msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
+
+#: builtin/stash.c:448
+#, fuzzy, c-format
+msgid "Merging %s with %s"
+msgstr "S'està fusionant %s amb %s\n"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "L'índex no estava sense emmagatzemar."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+#, fuzzy
+msgid "attempt to recreate the index"
+msgstr "S'ha produït un error en llegir l'índex"
+
+#: builtin/stash.c:549
+#, fuzzy, c-format
+msgid "Dropped %s (%s)"
+msgstr "${REV} ($s) descartada"
+
+#: builtin/stash.c:552
+#, fuzzy, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
+
+#: builtin/stash.c:577
+#, fuzzy, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'$args' no és una referència de magatzem"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Cap nom de branca especificat"
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, fuzzy, c-format
+msgid "Cannot update %s with %s"
+msgstr "No es pot actualitzar $ref_stash amb $w_commit"
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#, fuzzy
+msgid "stash message"
+msgstr "missatge d'etiqueta"
+
+#: builtin/stash.c:818
+#, fuzzy
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "--bisect-clean-state no accepta paràmetres"
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "No hi ha canvis seleccionats"
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "Encara no teniu la comissió inicial"
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "No es pot desar l'estat d'índex actual"
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "No es poden desar els fitxers no seguits"
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "No es pot desar l'estat d'arbre de treball actual"
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "No es pot registrar l'estat de l'arbre de treball"
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+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."
+
+#: builtin/stash.c:1285
+#, fuzzy
+msgid "Did you forget to 'git add'?"
+msgstr "Potser volíeu dir «git add .»?\n"
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "No hi ha canvis locals a desar"
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "No es pot inicialitzar el magatzem"
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "No es pot desar l'estat actual"
+
+#: builtin/stash.c:1327
+#, fuzzy, c-format
+msgid "Saved working directory and index state %s"
+msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "No es poden eliminar els canvis de l'arbre de treball"
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+#, fuzzy
+msgid "keep index"
+msgstr "Actualitza l'índex"
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+#, fuzzy
+msgid "quiet mode"
+msgstr "silenciós"
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+#, fuzzy
+msgid "include untracked files in stash"
+msgstr "mostra els fitxers no seguits en columnes"
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+#, fuzzy
+msgid "include ignore files"
+msgstr "elimina només els fitxers ignorats"
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr "no s'ha pogut executar %s"
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
#: builtin/stripspace.c:37
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:40
msgid "prepend comment character and space to each line"
msgid "cannot strip one component off url '%s'"
msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
"."
msgstr ""
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
-"run_command returned non-zero status while recursing in the nested submodules of %s\n"
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Inclou recursivament els submòduls imbrincats"
-#: builtin/submodule--helper.c:569
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+#: builtin/submodule--helper.c:570
+#, fuzzy
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
-msgid "could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."
-msgstr "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és el seu dipòsit font autoritzat."
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és "
+"el seu dipòsit font autoritzat."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, 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:685
+#: builtin/submodule--helper.c:686
#, 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:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:712
-msgid "git submodule--helper init [<path>]"
+#: builtin/submodule--helper.c:713
+#, fuzzy
+msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Suprimeix la sortida de l'estat del submòdul"
-#: builtin/submodule--helper.c:875
-msgid "Use commit stored in the index instead of the one stored in the submodule HEAD"
+#: builtin/submodule--helper.c:876
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "inclou recursivament els submòduls imbrincats"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
-msgstr "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
+msgstr ""
+"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Omet la sortida de la sincronització de l'url del submòdul"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you really want to remove it including all of "
-"its history)"
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
msgstr ""
"L'arbre de treball de submòdul «%s» conté un directori .git\n"
"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
-msgid "Submodule work tree '%s' contains local modifications; use '-f' to discard them"
-msgstr "L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' per a descartar-les"
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' "
+"per a descartar-les"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "S'ha netejat el directori «%s»\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no s'ha pogut crear el directori de submòdul buit %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
-msgstr "Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis locals"
+msgstr ""
+"Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis "
+"locals"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Desregistra recursivament tots els submòduls"
-#: builtin/submodule--helper.c:1192
-msgid "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
-msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
+#: builtin/submodule--helper.c:1193
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
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:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
+msgstr ""
+"Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
#: builtin/submodule--helper.c:1938
#, 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:2061
#, c-format
msgstr "inclou recursivament als submòduls"
#: builtin/submodule--helper.c:2100
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#, fuzzy
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<camí>...]"
#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "comprova si és segur escriure al fitxer .gitmodules"
-#: builtin/submodule--helper.c:2161
-msgid "git submodule--helper config name [value]"
+#: builtin/submodule--helper.c:2159
+#, fuzzy
+msgid "unset the config in the .gitmodules file"
+msgstr "l'allistament del .gitmodules actualitzat ha fallat"
+
+#: builtin/submodule--helper.c:2164
+#, fuzzy
+msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [valor]"
-#: builtin/submodule--helper.c:2162
+#: builtin/submodule--helper.c:2165
+#, fuzzy
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config name [valor]"
+
+#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2179 git-submodule.sh:169
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, fuzzy, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos per a procedir"
+msgstr ""
+"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
+"per a procedir"
-#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:2235
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "«%s» no és una subordre vàlida de submodule--helper"
+msgstr "«%s» no és un subordre vàlid de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "raó de l'actualització"
#: builtin/tag.c:25
-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>]"
+#, fuzzy
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr ""
+"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
+"d'etiqueta> [<cap>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
-#: builtin/tag.c:27
+#: builtin/tag.c:28
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:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:87
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "no s'ha trobat l'etiqueta «%s»."
-#: builtin/tag.c:103
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"Les línies que comencin amb «%c» s'ignoraran.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:139
#, 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:191
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
-#: builtin/tag.c:193
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:218
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "el tipus d'objecte és incorrecte."
-#: builtin/tag.c:267
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:274
+#: builtin/tag.c:291
#, 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:385
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:387
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:389
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:390
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:392
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:394
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:396
+#: builtin/tag.c:413
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:398
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "força l'edició del missatge de l'etiqueta"
-#: builtin/tag.c:399
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:403
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:404
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:405 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:407
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:408
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:409 builtin/tag.c:411
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:410 builtin/tag.c:412
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:413
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:414
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:419
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:463
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:485
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:487
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:489
+#: builtin/tag.c:508
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:491
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:493
+#: builtin/tag.c:512
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:504
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:523
+#: builtin/tag.c:542
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:529
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:534
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:565
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta «%s» actualitzada (era %s)\n"
#: builtin/update-index.c:153
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:166
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:179
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:190
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:201
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:214
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:221
msgid " OK"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:962
+#: builtin/update-index.c:971
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:965
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:972
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:981
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:985
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1017
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:1009
+#: builtin/update-index.c:1019
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:1011
+#: builtin/update-index.c:1021
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:1013
+#: builtin/update-index.c:1023
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:1017
+#: builtin/update-index.c:1027
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:1021
+#: builtin/update-index.c:1031
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:1025
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:1029
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1054
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:1046
+#: builtin/update-index.c:1056
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:1048
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "habilita o inhabilita el monitor del sistema de fitxers"
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "marca els fitxers com a vàlids pel fsmonitor"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "neteja el bit de validesa del fsmonitor"
-#: builtin/update-index.c:1156
-msgid "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"
+#: builtin/update-index.c:1168
+msgid ""
+"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"
-#: builtin/update-index.c:1165
-msgid "core.splitIndex is set to true; remove or change it, if you really want to disable split index"
+#: builtin/update-index.c:1177
+msgid ""
+"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:1176
-msgid "core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache"
+#: builtin/update-index.c:1188
+msgid ""
+"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:1180
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1188
-msgid "core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache"
+#: builtin/update-index.c:1200
+msgid ""
+"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:1192
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "La memòria cau no seguida està habilitada per a «%s»"
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr "core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu habilitar fsmonitor"
+msgstr ""
+"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
+"habilitar fsmonitor"
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor habilitat"
-#: builtin/update-index.c:1207
-msgid "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "core.fsmonitor està establert a cert; elimineu-lo si realment voleu inhabilitar fsmonitor"
+#: builtin/update-index.c:1219
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
+"inhabilitar fsmonitor"
-#: builtin/update-index.c:1211
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor inhabilitat"
#: 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:12
msgid "git update-ref [<options>] --stdin [-z]"
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
-msgstr "actualitza <nom de referència>, no la que assenyali"
+msgstr "actualitza <nom de referència>, no la que apunti"
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
#: builtin/upload-pack.c:27
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"
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <comissió>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:69
msgid "print commit contents"
msgstr "imprimeix els continguts de la comissió"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "imprimeix la sortida crua de l'estat gpg"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:61 builtin/worktree.c:888
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "s'ha produït un error en suprimir «%s»"
#: builtin/worktree.c:110
#, c-format
-msgid "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven "
+"%<PRIuMAX> bytes, llegits %<PRIuMAX>)"
#: builtin/worktree.c:118
#, c-format
#: builtin/worktree.c:127
#, 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:166
msgid "report pruned working trees"
msgstr "«%s» ja existeix"
#: builtin/worktree.c:252
-#, fuzzy, c-format
+#, c-format
msgid "unable to re-add worktree '%s'"
-msgstr "no s'ha pogut llegir l'arbre (%s)"
+msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»"
#: builtin/worktree.c:257
#, c-format
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:310
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:429 builtin/worktree.c:435
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:440
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
-#: builtin/worktree.c:446
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:498
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:490
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:492
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "configura el mode de seguiment (vegeu git-branch(1))"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
-msgstr "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment remot"
+msgstr ""
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
+"remot"
-#: builtin/worktree.c:509
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mútuament excloents"
-#: builtin/worktree.c:570
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track només es pot usar si es crea una branca nova"
-#: builtin/worktree.c:670
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789 builtin/worktree.c:916
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:684 builtin/worktree.c:717
+#: builtin/worktree.c:695 builtin/worktree.c:728
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:689
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:719
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
-#: builtin/worktree.c:760
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:768
+#: builtin/worktree.c:779
#, fuzzy
msgid "force move even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
-#: builtin/worktree.c:791 builtin/worktree.c:918
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
-#: builtin/worktree.c:796
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
-#: builtin/worktree.c:802
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "el destí «%s» ja existeix"
-#: builtin/worktree.c:810
+#: builtin/worktree.c:821
#, fuzzy, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:812
+#: builtin/worktree.c:823
#, fuzzy
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
-#: builtin/worktree.c:820
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/worktree.c:872
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:877
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
-#: builtin/worktree.c:900
+#: builtin/worktree.c:911
#, fuzzy
msgid "force removal even if worktree is dirty or locked"
msgstr "força el moviment / canvi de nom encara que el destí existeixi"
-#: builtin/worktree.c:923
+#: builtin/worktree.c:934
#, fuzzy, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:925
+#: builtin/worktree.c:936
#, fuzzy
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
msgid "too many commits marked reachable"
msgstr "masses comission marcades com abastable"
+#: t/helper/test-serve-v2.c:7
+#, fuzzy
+msgid "test-tool serve-v2 [<options>]"
+msgstr "git serve [<opcions>]"
+
+#: t/helper/test-serve-v2.c:19
+#, fuzzy
+msgid "exit immediately after advertising capabilities"
+msgstr "surt immediatament després de l'anunci inicial de referència"
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]"
msgstr ""
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
-"'git help -a' i 'git help -g' llisten subordres disponibles i\n"
-"algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
-"'git help <concepte>' per a llegir sobre una subordre o concepte específic."
+"«git help -a» i «git help -g» llisten subordres disponibles i\n"
+"algunes guies de concepte. Vegeu «git help <ordre>» o\n"
+"«git help <concepte>» per a llegir sobre un subordre o concepte específic.\n"
+"Vegeu «git help git» per a una visió general del sistema."
-#: git.c:174
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no s'ha especificat un directori per --git-dir\n"
-#: git.c:188
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no s'ha especificat un nom d'espai per --namespace\n"
-#: git.c:202
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no s'ha especificat un directori per --work-tree\n"
-#: git.c:216
+#: git.c:228
#, fuzzy, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "%s no admet --super-prefix"
-#: git.c:238
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera una cadena de configuració\n"
-#: git.c:276
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "no s'ha especificat un directori per -C\n"
-#: git.c:301
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "opció desconeguda: %s\n"
-#: git.c:342
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:351
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-#: git.c:359
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:362
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "àlies recursiu: %s"
-#: git.c:437
+#: git.c:460
msgid "write failure on standard output"
msgstr "fallada d'escriptura en la sortida estàndard"
-#: git.c:439
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
-#: git.c:441
+#: git.c:464
msgid "close failed on standard output"
msgstr "ha fallat el tancament en la sortida estàndard"
-#: git.c:720
+#: git.c:796
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:770
+#: git.c:846
#, fuzzy, c-format
msgid "cannot handle %s as a builtin"
msgstr "no es pot usar %s com a fitxer d'exclusió"
-#: git.c:783
+#: git.c:859
#, c-format
msgid ""
"usage: %s\n"
"\n"
-msgstr "ús: %s\n"
+msgstr ""
+"ús: %s\n"
"\n"
-#: git.c:803
+#: git.c:879
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:815
+#: git.c:891
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
msgid "Could not set SSL backend to '%s': already set"
msgstr "No s'ha pogut tornar a $head_name"
-#: http.c:1959
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" petició: %s\n"
" redirecció: %s"
-#: remote-curl.c:455
+#: remote-curl.c:157
+#, fuzzy, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "valor parcial no vàlid: «%s»"
+
+#: remote-curl.c:254
+#, fuzzy, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "«%s» no reconegut com un dipòsit git"
+
+#: remote-curl.c:355
+#, fuzzy
+msgid "invalid server response; expected service, got flush packet"
+msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+
+#: remote-curl.c:386
+#, fuzzy, c-format
+msgid "invalid server response; got '%s'"
+msgstr "referència no vàlida: %s"
+
+#: remote-curl.c:446
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "no s'ha trobat la branca «%s»."
+
+#: remote-curl.c:450
+#, fuzzy, c-format
+msgid "Authentication failed for '%s'"
+msgstr "falta el valor per «%s»"
+
+#: remote-curl.c:454
+#, fuzzy, c-format
+msgid "unable to access '%s': %s"
+msgstr "no s'ha pogut accedir a '%s': %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
-#: parse-options.h:154
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, fuzzy, c-format
+msgid "RPC failed; %s"
+msgstr "STARTTLS ha fallat! %s"
+
+#: remote-curl.c:764
+#, fuzzy
+msgid "cannot handle pushes this big"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+#, fuzzy
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "El servidor no permet clients superficials"
+
+#: remote-curl.c:1028
+#, fuzzy
+msgid "fetch failed."
+msgstr "l'«stash» ha fallat"
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, fuzzy, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, fuzzy, c-format
+msgid "http transport does not support %s"
+msgstr "la variant «simple» d'ssh no és compatible amb -4"
+
+#: remote-curl.c:1174
+#, fuzzy
+msgid "git-http-push failed"
+msgstr "l'«stash» ha fallat"
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: list-objects-filter-options.h:61
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:62
+msgid "object filtering"
+msgstr "filtratge d'objecte"
+
+#: parse-options.h:170
msgid "expiry-date"
msgstr "data-de-caducitat"
-#: parse-options.h:169
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
-#: parse-options.h:259
+#: parse-options.h:305
msgid "be more verbose"
msgstr "sigues més detallat"
-#: parse-options.h:261
+#: parse-options.h:307
msgid "be more quiet"
msgstr "sigues més callat"
-#: parse-options.h:267
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> xifres per presentar els SHA-1"
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr "com suprimir els espais i #comentaris del missatge"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "clau"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "nom del camp en el qual ordenar"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualitza l'índex amb la resolució de conflicte reusada si és possible"
+
+#: wt-status.h:68
+msgid "HEAD detached at "
+msgstr "HEAD separat a "
+
+#: wt-status.h:69
+msgid "HEAD detached from "
+msgstr "HEAD separat de "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Afegeix els continguts dels fitxers a l'índex"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
-msgstr "Mostra quina revisió i autor ha modificat per últim cop cada línia d'un fitxer"
+msgstr ""
+"Mostra quina revisió i autor ha modificat per últim cop cada línia d'un "
+"fitxer"
#: command-list.h:58
msgid "List, create, or delete branches"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
-msgstr "Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
+msgstr ""
+"Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
#: command-list.h:61
msgid "Display gitattributes information"
msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
#: command-list.h:65
-#,
-
msgid "Copy files from the index to the working tree"
-msgstr "camí a l'arbre de treball"
+msgstr "Copia fitxers des de l'índex a l'arbre de treball"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
-msgstr ""
+msgstr "Troba les comissions que encara s'han d'aplicar a la font"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
-msgstr "Aplica els canvis introduït per algunes comissions existents"
+msgstr "Aplica els canvis introduïts per algunes comissions existents"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
#: command-list.h:80
msgid "Helper to store credentials on disk"
-msgstr ""
+msgstr "Ajudant per a emmagatzemar credencials a disc"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
#: command-list.h:83
msgid "A CVS server emulator for Git"
-msgstr ""
+msgstr "Un emulador de servidor CVS per al Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
-msgstr ""
+msgstr "Un servidor realment senzill per a dipòsits Git"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
-msgstr ""
+msgstr "Dóna un nom llegible per humans basant-se en les referències disponibles"
#: command-list.h:86
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."
#: command-list.h:87
msgid "Compares files in the working tree and the index"
#: command-list.h:90
msgid "Show changes using common diff tools"
-msgstr ""
+msgstr "Mostra els canvis usant eines diff comunes"
#: command-list.h:91
msgid "Git data exporter"
#: command-list.h:92
msgid "Backend for fast Git data importers"
-msgstr ""
+msgstr "Rerefons per a importadors ràpids de dades de Git"
#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "Baixa objectes i referències d'un altre dipòsit"
#: command-list.h:94
-#, fuzzy
msgid "Receive missing objects from another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Rep els objectes que manquen des d'un altre dipòsit"
#: command-list.h:95
msgid "Rewrite branches"
msgstr "Torna a escriure les branques"
#: command-list.h:96
-#, fuzzy
msgid "Produce a merge commit message"
-msgstr "edita el missatge de comissió"
+msgstr "Produeix un missatge de comissió de fusió"
#: command-list.h:97
-#, fuzzy
msgid "Output information on each ref"
-msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
+msgstr "Mostra la informació en cada referència"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
-msgstr ""
+msgstr "Prepara pedaços per enviar-los per correu electrònic"
#: command-list.h:99
-#, fuzzy
msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "escriu l'objecte a la base de dades d'objectes"
+msgstr "Verifica la connectivitat i validesa del objectes a la base de dades"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "Neteja els fitxers innecessaris i optimitza el dipòsit local"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
#: command-list.h:103
msgid "A portable graphical interface to Git"
-msgstr ""
+msgstr "Una interfície gràfic portable per al Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
+msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer"
#: command-list.h:105
msgid "Display help information about Git"
-msgstr ""
+msgstr "Mostra informació d'ajuda del Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:107
-#, fuzzy
msgid "Download from a remote Git repository via HTTP"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Baixa des d'un dipòsit Git remot via HTTP"
#: command-list.h:108
#, fuzzy
msgstr ""
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
-#, fuzzy
msgid "The Git repository browser"
-msgstr "no és un dipòsit de git: %s"
+msgstr "El navegador de dipòsits Git"
#: command-list.h:115
msgid "Show commit logs"
msgstr "Mostra els registres de comissió"
#: command-list.h:116
-#, fuzzy
msgid "Show information about files in the index and the working tree"
-msgstr "i ha fet canvis a l'índex o l'arbre de treball"
+msgstr "Mostra informació sobre els fitxer a l'índex i a l'arbre de treball"
#: command-list.h:117
-#, fuzzy
msgid "List references in a remote repository"
-msgstr "dipòsit de referència"
+msgstr "Mostra les referències d'un dipòsit remot"
#: command-list.h:118
-#, fuzzy
msgid "List the contents of a tree object"
-msgstr "imprimeix només les etiquetes de l'objecte"
+msgstr "Mostra els continguts d'un objecte de l'arbre"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
+msgstr "Executa eines de resolució de conflictes per a resoldre conflictes de fussió"
#: command-list.h:127
msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:129
-#, fuzzy
msgid "Creates a tag object"
-msgstr "edita un objecte existent"
+msgstr "Crea un objecte etiqueta"
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:133
-#, fuzzy
msgid "Add or inspect object notes"
-msgstr "no s'ha rebut l'objecte esperat %s"
+msgstr "Afegeix o inspecciona notes de l'objecte"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
-msgstr ""
+msgstr "Importa des de i envia a dipòsits Perforce"
#: command-list.h:135
-#, fuzzy
msgid "Create a packed archive of objects"
-msgstr "ignora els objectes empaquetats"
+msgstr "Crea un arxiu empaquetat d'objectes"
#: command-list.h:136
-#, fuzzy
msgid "Find redundant pack files"
-msgstr "no es pot fer pread en el fitxer de paquet"
+msgstr "Troba fitxers empaquetats redundants"
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
#: command-list.h:143
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"
#: command-list.h:144
#, fuzzy
#: command-list.h:152
#, fuzzy
msgid "Create, list, delete refs to replace objects"
-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"
#: command-list.h:153
msgid "Generates a summary of pending changes"
msgstr "Restableix la HEAD actual a l'estat especificat"
#: command-list.h:156
-#, fuzzy
-msgid "Revert some existing commits"
-msgstr "no es pot esmenar una comissió no existent"
+msgid "Restore working tree files"
+msgstr "Restaura els fitxers de l'arbre de treball"
#: command-list.h:157
-#, fuzzy
-msgid "Lists commit objects in reverse chronological order"
-msgstr "mostra les comissions en ordre topològic"
+msgid "Revert some existing commits"
+msgstr "Reverteix comissions existents"
#: command-list.h:158
-#, fuzzy
-msgid "Pick out and massage parameters"
-msgstr "massa paràmetres"
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Mostra les comissions en ordre topològic invers"
#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr "Escolleix i personalitza els paràmetres"
+
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
-msgstr ""
+msgstr "Envia una col·leció de pedaços com a correus electrònics"
-#: command-list.h:161
-#, fuzzy
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Puja objectes sobre el protocol Git a un altre dipòsit"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr ""
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Mostra diversos tipus d'objectes"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Mostra les branques i les seves comissions"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
-msgstr ""
+msgstr "Mostra l'índex d'arxius empaquetat"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Llista les referències en un dipòsit local"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
-msgstr ""
+msgstr "Codi de scripts de configuració comuns pel Git shell"
-#: command-list.h:170
+#: command-list.h:171
#, fuzzy
msgid "Stash the changes in a dirty working directory away"
msgstr "%s: ja existeix en el directori de treball"
-#: command-list.h:171
+#: command-list.h:172
#, fuzzy
msgid "Add file contents to the staging area"
msgstr "Afegeix els continguts dels fitxers a l'índex"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Mostra l'estat de l'arbre de treball"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Suprimeix l'espai en blanc innecessari"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Inicialitza, actualitza o inspecciona submòduls"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operació bidireccional entre un dipòsit a Subversion i Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Commuta branques"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Llegeix, modifica i suprimeix referències simbòliques"
-#: command-list.h:177
+#: command-list.h:179
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"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
-msgstr ""
+msgstr "Crea un fitxer temporal amb els continguts dels blobs"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
-msgstr ""
+msgstr "Desempaqueta objectes d'un arxiu empaquetat"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
-msgstr "Actualitza el nom de l'objecte emmagatzema en una referència de forma segura"
+msgstr ""
+"Actualitza el nom de l'objecte emmagatzema en una referència de forma segura"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Envia l'arxiu de tornada al git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Mostra una variable lògica del Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Verifica la signatura GPG de les comissions"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valida els fitxers d'arxius Git empaquetats"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Verifica la signatura GPG de les etiquetes"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfície web del Git (interfície web pels dipòsits Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Mostra registres amb la diferència introduïda per cada comissió"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples arbres de treball"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Crea un objecte arbre des de l'índex actual"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Interfície i convencions de la línia d'ordres del Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Un tutorial bàsic del Git per a desenvolupadors"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git per a usuaris del CVS"
-#: command-list.h:197
+#: command-list.h:199
#, fuzzy
msgid "Tweaking diff output"
msgstr "omet la sortida de diferències"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunt mínim útil d'ordres diàries del Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un glossari de Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Lligams utilitzats pel Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Espais de noms del Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposició del dipòsit del Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial d'introducció al Git: segona part"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Un tutorial d'introducció al Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: list-objects-filter-options.h:63
-msgid "args"
-msgstr "args"
-
-#: list-objects-filter-options.h:64
-msgid "object filtering"
-msgstr "filtratge d'objecte"
-
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if 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\""
msgstr "Cal començar per \"git bisect start\""
msgstr "No estem bisecant."
#: 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."
#: 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."
-
-#: git-legacy-rebase.sh:445
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "No s'ha pogut tornar a $head_name"
-
-#: git-legacy-rebase.sh:471
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Sembla que ja hi ha un directori $state_dir_base, i\n"
-"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
-"cas, proveu\n"
-"\t$cmd_live_rebase\n"
-"Si no és el cas, \n"
-"\t$cmd_clear_stale_rebase\n"
-"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
-"de valor."
-
-#: git-legacy-rebase.sh:523
-msgid "fatal: cannot combine am options with either interactive or merge options"
msgstr ""
+"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-legacy-rebase.sh:530
-msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»"
-
-#: git-legacy-rebase.sh:541
-msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-
-#: git-legacy-rebase.sh:550
-msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-
-#: git-legacy-rebase.sh:552
-msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»"
-
-#: git-legacy-rebase.sh:578
-#, fuzzy, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "font no vàlida $upstream_name"
-
-#: git-legacy-rebase.sh:602
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: ja hi ha més d'una base de fusió"
-
-#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: no hi ha cap base de fusió"
-
-#: git-legacy-rebase.sh:614
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "No assenyala una comissió vàlida: $onto_name"
-
-#: git-legacy-rebase.sh:640
-#, fuzzy, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "fatal: no hi ha tal branca: $branch_name"
-
-#: git-legacy-rebase.sh:678
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-
-#: git-legacy-rebase.sh:707
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "La branca actual $branch_name està al dia."
-
-#: git-legacy-rebase.sh:717
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-
-#: git-legacy-rebase.sh:731
-#, sh-format
-msgid "Changes to $onto:"
-msgstr "Canvis a $onto:"
-
-#: git-legacy-rebase.sh:733
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Canvis de $mb a $onto:"
-
-#: git-legacy-rebase.sh:743
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
-
-#: git-legacy-rebase.sh:757
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
-
-#: git-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear amb paràmetres no està implementat"
-
-#: git-stash.sh:125
-msgid "You do not have the initial commit yet"
-msgstr "Encara no teniu la comissió inicial"
-
-#: git-stash.sh:140
-msgid "Cannot save the current index state"
-msgstr "No es pot desar l'estat d'índex actual"
-
-#: git-stash.sh:155
-msgid "Cannot save the untracked files"
-msgstr "No es poden desar els fitxers no seguits"
-
-#: git-stash.sh:175 git-stash.sh:188
-msgid "Cannot save the current worktree state"
-msgstr "No es pot desar l'estat d'arbre de treball actual"
-
-#: git-stash.sh:192
-msgid "No changes selected"
-msgstr "No hi ha canvis seleccionats"
-
-#: git-stash.sh:195
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:208
-msgid "Cannot record working tree state"
-msgstr "No es pot registrar l'estat de l'arbre de treball"
-
-#: git-stash.sh:246
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
-#: git-stash.sh:298
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:312
-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:320
-msgid "No local changes to save"
-msgstr "No hi ha canvis locals a desar"
-
-#: git-stash.sh:325
-msgid "Cannot initialize stash"
-msgstr "No es pot inicialitzar el magatzem"
-
-#: git-stash.sh:329
-msgid "Cannot save the current status"
-msgstr "No es pot desar l'estat actual"
-
-#: git-stash.sh:330
+#: git-legacy-stash.sh:355
#, 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:359
-msgid "Cannot remove worktree changes"
-msgstr "No es poden eliminar els canvis de l'arbre de treball"
-
-#: git-stash.sh:507
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:520
-msgid "No stash entries found."
-msgstr "No s'ha trobat cap «stash»."
-
-#: git-stash.sh:527
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:542
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:570
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:581
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:589
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:593
+#: git-legacy-stash.sh:621
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:601
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:603
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:612
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
-#: git-stash.sh:637
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
-#: git-stash.sh:652
-msgid "Index was not unstashed."
-msgstr "L'índex no estava sense emmagatzemar."
-
-#: git-stash.sh:666
-msgid "The stash entry is kept in case you need it again."
-msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-
-#: git-stash.sh:675
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:676
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:684
-msgid "No branch name specified"
-msgstr "Cap nom de branca especificat"
-
-#: git-stash.sh:763
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-#: git-submodule.sh:198
+#: git-submodule.sh:200
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:208
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../"
-#: git-submodule.sh:227
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ja existeix en l'índex"
-#: git-submodule.sh:230
+#: git-submodule.sh:232
#, sh-format
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:236
+#: git-submodule.sh:239
+#, fuzzy, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "el camí «%s» no té la seva versió"
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Useu -f si realment voleu afegir-lo."
-#: git-submodule.sh:259
+#: git-submodule.sh:268
#, 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:261
+#: git-submodule.sh:270
#, 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:269
+#: git-submodule.sh:278
#, 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:271
+#: git-submodule.sh:280
#, 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:277
+#: git-submodule.sh:286
#, 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:289
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No s'ha pogut agafar el submòdul '$sm_path'"
-#: git-submodule.sh:294
+#: git-submodule.sh:303
#, 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:303
+#: git-submodule.sh:312
#, 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:563
+#: git-submodule.sh:573
#, 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:573
+#: git-submodule.sh:583
#, 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:578
+#: git-submodule.sh:588
#, 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 '$sm_path'"
+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:596
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+#: git-submodule.sh:606
+#, fuzzy, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:602
+#: git-submodule.sh:612
#, 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:609
+#: git-submodule.sh:619
#, 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:610
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:614
+#: git-submodule.sh:624
#, 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:615
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
-#: git-submodule.sh:620
+#: git-submodule.sh:630
#, 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:621
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:626
+#: git-submodule.sh:636
#, 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:627
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:658
+#: git-submodule.sh:668
#, 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:754
+#: git-submodule.sh:830
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:806
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:826
+#: git-submodule.sh:902
#, 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:829
+#: git-submodule.sh:905
#, 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:832
+#: git-submodule.sh:908
#, 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"
msgid "See git-${cmd}(1) for details."
msgstr "Vegeu git-${cmd}(1) per detalls."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+#, fuzzy
+msgid "Applied autostash."
+msgstr "S'ha aplicat el magatzem automàtic."
+
+#: git-rebase--preserve-merges.sh:112
+#, fuzzy, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No es pot emmagatzemar $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "S'està fent «rebase» ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
#, fuzzy
msgid ""
"\n"
" 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 (la resta 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 (la resta 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"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no és una comissió que es pugui escollir"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de comissió no vàlid: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avanç ràpid a $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No es pot avançar ràpidament a $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No es pot moure HEAD a $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
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 lligam de\n"
"precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
"necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
"comissió."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
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--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Primer cometeu-los i després executeu «git rebase --continue» de nou."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "No s'han pogut cometre els canvis «staged»."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "No s'han pogut iniciar les comissions reescrites"
msgid "usage: $dashless $USAGE"
msgstr "ús: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, 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
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "No es pot $action: Teniu canvis «unstaged»."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
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
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
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
+#: git-sh-setup.sh:378
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:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "staged"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "unstaged"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binari"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "res"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "sense canvis"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, 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:612
+#: git-add--interactive.perl:626
#, 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:615
+#: git-add--interactive.perl:629
#, 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:618
+#: git-add--interactive.perl:632
#, 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:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «staging»."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «stashing»."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «unstaging»."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per aplicar-se."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per descartar-se."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, 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:1086
+#: git-add--interactive.perl:1110
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:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"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:1100
+#: git-add--interactive.perl:1124
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:1114
+#: git-add--interactive.perl:1138
#, 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"
#. 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:1213
-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:1237
+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:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+#, fuzzy
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplica aquest tros a l'índex i l'arbre de treball\n"
+"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
+"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
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:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "No s'ha aplicat res.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, 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:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, 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:1395
+#: git-add--interactive.perl:1431
#, 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:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, 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:1400
+#: git-add--interactive.perl:1436
#, 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:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, 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:1405
+#: git-add--interactive.perl:1441
#, 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:1406
+#: git-add--interactive.perl:1442
#, 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:1407
+#: git-add--interactive.perl:1443
#, 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:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, 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,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, 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:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, 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:1415
+#: git-add--interactive.perl:1451
#, 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:1416
+#: git-add--interactive.perl:1452
#, 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:1417
+#: git-add--interactive.perl:1453
#, 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:1420
+#: git-add--interactive.perl:1456
#, 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:1421
+#: git-add--interactive.perl:1457
#, 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:1422
+#: git-add--interactive.perl:1458
#, 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:1522
+#: git-add--interactive.perl:1466
+#, fuzzy, perl-format
+msgid "Apply mode change to 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,?]? "
+
+#: git-add--interactive.perl:1467
+#, fuzzy, perl-format
+msgid "Apply deletion to 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:1468
+#, fuzzy, perl-format
+msgid "Apply this hunk to 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:1568
msgid "No other hunks to goto\n"
msgstr "No hi ha altres trossos on anar-hi\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
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:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "vés a quin tros? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número no vàlid: «%s»\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "No hi ha cap altre tros a cercar\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "Cerca per expressió regular? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "No es pot dividir aquest tros\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, 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:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "No es pot editar aquest tros\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Reviseu les diferències"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
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 ""
"status - mostra els camins amb canvis\n"
-"update - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
+"update - afegeix l'estat de l'arbre de treball al conjunt de canvis "
+"«staged»\n"
"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
"patch - selecciona trossos i actualitza'ls selectivament\n"
"diff - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
+"canvis «staged»\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 git-add--interactive.perl:1750
-#: git-add--interactive.perl:1757 git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "manca --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
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:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, 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:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' conté el correu redactat.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:395 git-send-email.perl:650
+#: git-send-email.perl:481 git-send-email.perl:683
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:398
-msgid "`batch-size` and `relogin` must be specified together (via command-line or configuration option)\n"
+#: git-send-email.perl:484
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
msgstr ""
-#: git-send-email.perl:468
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "--confirm setting desconegut: «%s»\n"
-#: git-send-email.perl:525
+#: git-send-email.perl:556
#, 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:527
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: `:include:` no està suportat: %s\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:560
#, 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:534
+#: git-send-email.perl:565
#, 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:616
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 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:637
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "S'ha produït un error en obrir el directori %s: %s"
-#: git-send-email.perl:661
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:672
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:685
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:695
+#: git-send-email.perl:728
#, 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:706
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Netegeu el contingut del cos si no voleu enviar un resum.\n"
-#: git-send-email.perl:730
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:747
+#: git-send-email.perl:780
#, 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:790
+#: git-send-email.perl:823
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:825
+#: git-send-email.perl:858
#, 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:880
-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:913
+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:885
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:893
+#: git-send-email.perl:926
#, 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 ""
"S'ha refusat a enviar perquè el pedaç\n"
"\t%s\n"
-"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si realment voleu enviar-lo.\n"
+"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si "
+"realment voleu enviar-lo.\n"
-#: git-send-email.perl:912
+#: git-send-email.perl:945
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:930
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:942
+#: git-send-email.perl:975
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:1000 git-send-email.perl:1008
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, 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"
#. 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:1012
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1329
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA «%s» no existeix"
-#: git-send-email.perl:1412
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1427
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
+msgstr ""
+"Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
-#: git-send-email.perl:1430
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Requereix resposta en enviar el correu"
-#: git-send-email.perl:1458
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1505
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1510 git-send-email.perl:1514
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS ha fallat! %s"
-#: git-send-email.perl:1523
+#: git-send-email.perl:1556
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."
+msgstr ""
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
+"useu --smtp-debug."
-#: git-send-email.perl:1541
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1544
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1558
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1561
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1626 git-send-email.perl:1646
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, 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:1632
+#: git-send-email.perl:1665
#, 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:1685
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1720
+#: git-send-email.perl:1753
#, 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:1831
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1838
+#: git-send-email.perl:1871
#, 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:1842
+#: git-send-email.perl:1875
#, 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:1872
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1880
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codificació de transferència no vàlida"
-#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1924
+#: git-send-email.perl:1957
#, 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:1941
+#: git-send-email.perl:1974
#, 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:1945
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
+
+#, fuzzy
+#~ msgid "hash version %X does not match version %X"
+#~ msgstr "el camí «%s» no té la seva versió"
+
+#~ msgid "option '%s' requires a value"
+#~ msgstr "l'opció «%s» requereix un valor"
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "El servidor accepta multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "El servidor accepta no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "El servidor accepta multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "El servidor accepta side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "El servidor accepta banda lateral"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "El servidor accepta allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "El servidor accepta allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "El servidor accepta ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD separat a %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD separat de %s)"
+
+#~ msgid "could not transform the todo list"
+#~ msgstr "no s'ha pogut transformar la llista per a fer"
+
+#~ msgid "Checking out files"
+#~ msgstr "S'estan agafant fitxers"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "s'ha produït un error en fer stat a '%s'\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Si voleu ometre aquesta comissió, useu:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Llavors \"git cherry-pick --continue\" reprendrà\n"
+#~ "com a «cherry pick» les comissions restants.\n"
+
+#~ msgid "default"
+#~ msgstr "per defecte"
+
+#~ msgid "Could not create directory '%s'"
+#~ msgstr "No s'ha pogut crear el directori «%s»"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "paràmetre no reconegut: %s"
+
+#~ msgid "could not open %s"
+#~ msgstr "no s'ha pogut obrir «%s»"
+
+#~ msgid "Could not move back to $head_name"
+#~ msgstr "No s'ha pogut tornar a $head_name"
+
+#~ msgid ""
+#~ "It seems that there is already a $state_dir_base directory, and\n"
+#~ "I wonder if you are in the middle of another rebase. If that is the\n"
+#~ "case, please try\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "If that is not the case, please\n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "and run me again. I am stopping in case you still have something\n"
+#~ "valuable there."
+#~ msgstr ""
+#~ "Sembla que ja hi ha un directori $state_dir_base, i\n"
+#~ "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
+#~ "cas, proveu\n"
+#~ "\t$cmd_live_rebase\n"
+#~ "Si no és el cas, \n"
+#~ "\t$cmd_clear_stale_rebase\n"
+#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
+#~ "de valor."
+
+#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+#~ msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»"
+
+#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»"
+
+#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»"
+
+#, fuzzy
+#~ msgid "invalid upstream '$upstream_name'"
+#~ msgstr "font no vàlida $upstream_name"
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: ja hi ha més d'una base de fusió"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: no hi ha cap base de fusió"
+
+#~ msgid "Does not point to a valid commit: $onto_name"
+#~ msgstr "No assenyala una comissió vàlida: $onto_name"
+
+#, fuzzy
+#~ msgid "fatal: no such branch/commit '$branch_name'"
+#~ msgstr "fatal: no hi ha tal branca: $branch_name"
+
+#~ msgid "Created autostash: $stash_abbrev"
+#~ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
+
+#~ msgid "Current branch $branch_name is up to date."
+#~ msgstr "La branca actual $branch_name està al dia."
+
+#~ msgid "Current branch $branch_name is up to date, rebase forced."
+#~ msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
+
+#~ msgid "Changes to $onto:"
+#~ msgstr "Canvis a $onto:"
+
+#~ msgid "Changes from $mb to $onto:"
+#~ msgstr "Canvis de $mb a $onto:"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
+
+#~ msgid "First, rewinding head to replay your work on top of it..."
+#~ msgstr ""
+#~ "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
+#~ "damunt..."
# German translations for Git.
-# Copyright (C) 2010-2016 Ralf Thielow <ralf.thielow@gmail.com>
+# Copyright (C) 2019 Matthias Rüster <matthias.ruester@gmail.com>
# This file is distributed under the same license as the Git package.
-# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2016.
+# Matthias Rüster <matthias.ruester@gmail.com>, 2019.
+# Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+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"
+"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
+"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
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:158
+#: advice.c:164
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:160
+#: advice.c:166
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:162
+#: advice.c:168
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:164
+#: advice.c:170
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:166
+#: advice.c:172
#, 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:174
+#: advice.c:180
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."
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Hinweis: Checke '%s' aus.\n"
+"Hinweis: Wechsle zu '%s'.\n"
"\n"
"Sie befinden sich im Zustand eines 'losgelösten HEAD'. Sie können sich\n"
"umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
"Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
-"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie einen\n"
-"weiteren Checkout durchführen.\n"
+"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie zu einem\n"
+"anderen Branch wechseln.\n"
"\n"
"Wenn Sie einen neuen Branch erstellen möchten, um Ihre erstellten Commits\n"
-"zu behalten, können Sie das (jetzt oder später) durch einen weiteren "
-"Checkout\n"
-"mit der Option -b tun. Beispiel:\n"
+"zu behalten, können Sie das (jetzt oder später) durch Nutzung von\n"
+"'switch' mit der Option -c tun. Beispiel:\n"
+"\n"
+" git switch -c <neuer-Branchname>\n"
"\n"
-" git checkout -b <neuer-Branchname>\n"
+"Oder um diese Operation rückgängig zu machen:\n"
+" git switch -\n"
+"\n"
+"Sie können diesen Hinweis ausschalten, indem Sie die Konfigurationsvariable\n"
+"'advice.detachedHead' auf 'false' setzen.\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "Nicht geschlossene Anführungszeichen."
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "Nicht erkannte Whitespace-Option: '%s'"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: apply.c:950
+#: apply.c:922
#, 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:956
+#: apply.c:928
#, 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:957
+#: apply.c:929
#, 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:962
+#: apply.c:934
#, 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:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "Ungültiger Modus in Zeile %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "Inkonsistente Kopfzeilen %d und %d."
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: apply.c:1584
+#: apply.c:1564
#, 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:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: apply.c:3078
+#: apply.c:3058
#, 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:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"bei der Suche nach:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: apply.c:3114
+#: apply.c:3094
#, 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:3161
+#: apply.c:3141
#, 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:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
"entspricht"
-#: apply.c:3179
+#: apply.c:3159
#, 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:3197
+#: apply.c:3177
#, 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:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: apply.c:3216
+#: apply.c:3196
#, 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:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: apply.c:3579
+#: apply.c:3559
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:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Falle zurück auf 3-Wege-Merge ...\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3966
+#: apply.c:3946
#, 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:3971
+#: apply.c:3951
#, 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:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: apply.c:4102
+#: apply.c:4082
#, 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:4109
+#: apply.c:4089
#, 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:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4317
+#: apply.c:4297
#, 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:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4549
+#: apply.c:4529
#, 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:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4906
+#: apply.c:4886
#, 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:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, 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:4920
+#: apply.c:4900
#, 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:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "Pfad"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "Anzahl"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:4975
+#: apply.c:4955
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:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:4981
+#: apply.c:4961
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:4983
+#: apply.c:4963
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:4985
+#: apply.c:4965
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:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:4976
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:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "Aktion"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
msgid "not a tree object: %s"
msgstr "Kein Tree-Objekt: %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "Format"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "Präfix"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "Datei"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "nur speichern"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "Repository"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "Programm"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
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:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr ""
"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
-#: blame.c:1829
+#: blame.c:2732
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:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
-#: blame.c:1856
+#: blame.c:2759
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:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "Pfad %s nicht in %s"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "Um ein Paket zu überprüfen wird ein Repository benötigt."
+
+#: bundle.c:197
#, 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:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Das Paket speichert eine komplette Historie."
-#: bundle.c:203
+#: bundle.c:206
#, 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:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
-#: commit.c:1128
+#: commit.c:1127
#, 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."
-#: commit.c:1131
+#: commit.c:1130
#, 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."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: commit.c:1137
+#: commit.c:1136
#, 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"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"Encoding,\n"
"welches von ihrem Projekt verwendet wird.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "Commit-Graph-Datei ist zu klein."
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei "
"möglicherweise unvollständig"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "Commit-Graph Verkettung stimmt nicht überein."
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "Konnte Commit %s nicht finden."
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Lade bekannte Commits in Commit-Graph"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "Erweitere erreichbare Commits in Commit-Graph"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Lösche Commit-Markierungen in Commit-Graph"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Commit-Graph Generierungsnummern berechnen"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "Fehler beim Hinzufügen von Paket %s."
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "Fehler beim Öffnen des Index für %s."
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Suche Commits für Commit-Graph in %d Referenz"
msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Zähle Commits in Commit-Graph"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Suche zusätzliche Ränder in Commit-Graph"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "Zu viele Commits zum Schreiben des Graphen."
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen."
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen."
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Durchsuche zusammengeführte Commits"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "Unerwartete doppelte Commit-ID %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Zusammenführen von Commit-Graph"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "Zu viele Commits zum Schreiben des Graphen."
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
"beschädigt."
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Commit in Commit-Graph überprüfen"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
"null"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
"null"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
-#: config.c:190
+#: config.c:197
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:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
-#: config.c:963
+#: config.c:998
#, 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:966
+#: config.c:1001
#, 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:969
+#: config.c:1004
#, 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:972
+#: config.c:1007
#, 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:975
+#: config.c:1010
#, 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:978
+#: config.c:1013
#, 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:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "Ungültiger Wert für %s."
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
-#: config.c:2298
+#: config.c:2333
#, 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:2344
+#: config.c:2379
#, 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:2346
+#: config.c:2381
#, 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:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "mmap für '%s' fehlgeschlagen"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
msgid "unable to fork"
msgstr "Kann Prozess nicht starten."
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
"Regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
"viele Capture-Gruppen (maximal %d)."
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d Delta-Islands markiert, fertig.\n"
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:4555
+#: diff.c:4560
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:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "Ungültiger --stat Wert: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s erwartet einen numerischen Wert."
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s erwartet die Form <n>/<m>"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s erwartet ein Zeichen, '%s' bekommen"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "Ungültiges --color-moved Argument: %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "Ungültiger Modus '%s' in --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "Ungültiges Argument für %s"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "Ungültiges --word-diff Argument: %s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Diff-Optionen zu Ausgabeformaten"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "Erzeuge Patch"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "Erstelle Unterschiede im Rohformat"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "Synonym für '-p --raw'"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "Synonym für '-p --stat'"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "maschinenlesbare Ausgabe von --stat"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "nur die letzte Zeile von --stat ausgeben"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<Parameter1,Parameter2>..."
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"Gebe die Verteilung des relativen Umfangs der Änderungen für jedes "
"Unterverzeichnis aus"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "Synonym für --dirstat=cumulative"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
"Änderungen der Datei-Rechte"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "nur Dateinamen der geänderten Dateien anzeigen"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "Generiere Zusammenfassung der Unterschiede"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<Breite>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<Anzahl>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen"
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "Zeige farbige Unterschiede"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "<Art>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
"Unterschieden hervor"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
"Ausgabefeldern bei --raw oder --numstat"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<Präfix>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "Zeige keine Quell- oder Ziel-Präfixe an"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von "
"Zeilen."
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<Zeichen>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Diff-Optionen zur Umbenennung"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
"\"erstellen\""
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "Umbenennungen erkennen"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "Preimage für Löschungen weglassen."
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "Kopien erkennen"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "Erkennung von Umbenennungen deaktivieren"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "Nutze leere Blobs als Quelle von Umbennungen"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Diff Algorithmus-Optionen"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "Erzeuge die kleinstmöglichen Änderungen"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "Ignoriere Änderungen in leeren Zeilen"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
"verschieben"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<Algorithmus>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "Ein Algorithmus für Änderungen wählen"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<Text>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<Modus>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<Regex>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "Verschobene Codezeilen sind andersfarbig"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "Wie Whitespaces in --color-moved ignoriert werden"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Andere Diff-Optionen"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
"zeige relative Pfade an"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "alle Dateien als Text behandeln"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "Keine Ausgaben vom Programm"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "Erlaube die Ausführung eines externes Programms für Änderungen"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
"werden"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<wann>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<Format>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "verstecke 'git add -N' Einträge vom Index"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "Behandle 'git add -N' Einträge im Index als echt"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<Zeichenkette>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
"Zeichenkette verändern"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
"regulären Ausdrucks verändern"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "zeige alle Änderungen im Changeset mit -S oder -G"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr ""
"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<Objekt-ID>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
"Objektes verändern"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "Wähle Dateien anhand der Art der Änderung"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<Datei>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Ausgabe zu einer bestimmten Datei"
-#: diff.c:6150
+#: diff.c:6177
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:6153
+#: diff.c:6180
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:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "Ungültige shallow-Zeile: %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "Ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "Kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
msgid "giving up"
msgstr "Gebe auf"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "Fertig"
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Server unterstützt keine shallow-Clients"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Server unterstützt multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Server unterstützt no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Server unterstützt multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Server unterstützt side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Server unterstützt side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Server unterstützt allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Server unterstützt allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Server unterstützt ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Server unterstützt Filter"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Server unterstützt %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Server unterstützt keine shallow-Clients"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Server unterstützt keine shallow-Anfragen."
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Server unterstützt Filter"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "konnte Anfrage nicht zum Remote schreiben"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "Erwartete Versand einer Packdatei nach 'ready'."
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "Unerwartetes wanted-ref: '%s'"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "keine solche Remote-Referenz %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, 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:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
msgid "These are common Git commands used in various situations:"
msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
msgid "sparse:path filters support has been dropped"
msgstr "Keine Unterstützung für sparse:path Filter mehr"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "Ungültige filter-spec '%s'"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "Kann Remote-Repository für partielles Klonen nicht ändern."
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
msgid "error building trees"
msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, 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:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, 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:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Spule Submodul %s vor"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
"gefunden)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
"schreibe stattdessen nach %s."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
"im Arbeitsbereich gelassen."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"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:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"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:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"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:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Verweigere geänderte Datei bei %s zu verlieren."
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
"ist."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, 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:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
"hinzu"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, 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:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
"Pfade dahin zu setzen: %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
"zu setzen: %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
"wurde."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
"umbenannt wurde in %s; Verschiebe es nach %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
"verschoben werden."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, 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:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"überschrieben werden:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, 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:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index-Datei %s ist zu klein."
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index-Version %d nicht erkannt."
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "Hash-Version %u stimmt nicht überein."
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "Ungültiger Chunk-Offset (zu groß)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet."
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein."
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "Fehler beim Hinzufügen von Packdatei '%s'."
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "Fehler beim Löschen des multi-pack-index bei %s"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Suche nach referenzierten Pack-Dateien"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
"fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Verifiziere OID-Reihenfolge in MIDX"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Sortiere Objekte nach Pack-Datei"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "Konnte 'pack-objects' nicht ausführen"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "Konnte 'pack-objects' nicht beenden"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht erzeugen: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht beitreten: %s"
msgid "hash mismatch %s"
msgstr "Hash stimmt nicht mit %s überein."
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: packfile.c:1868
+#: packfile.c:1899
#, 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?)"
-#: packfile.c:1872
+#: packfile.c:1903
#, 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?)"
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "Konnte Git-Header '%.*s' nicht parsen."
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "Konnte Log für '%s' nicht parsen."
msgstr "Ungeordnete Stage-Einträge für '%s'."
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
msgid "broken index, expect %s in %s, got %s"
msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
msgstr[0] "Rebase von %s auf %s (%d Kommando)"
msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "Konnte '%s' nicht schreiben."
"Warnungen zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s zeigt auf kein gültiges Objekt!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "Konnte Referenz '%s' nicht lesen."
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "Referenz '%s' existiert bereits."
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'."
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "Unerwartete Objekt-ID beim Löschen von '%s'."
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "Log für Referenz %s hat eine Lücke nach %s."
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "Log für Referenz %s unerwartet bei %s beendet."
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "Log für %s ist leer."
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'."
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt."
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten."
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existiert; kann '%s' nicht erstellen"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten."
msgid "invalid refspec '%s'"
msgstr "Ungültige Refspec '%s'"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "entfernt"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "%d voraus"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "%d hinterher"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) akzeptiert keine Argumente"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) akzeptiert keine Argumente"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "Positiver Wert erwartet objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "nicht erkanntes %%(objectname) Argument: %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "Format: %%(end) Atom mehr als einmal verwendet"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1453
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(kein Branch, Rebase von Branch %s im Gange)"
+msgid "no branch, rebasing %s"
+msgstr "kein Branch, Rebase von %s"
-#: ref-filter.c:1456
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "kein Branch, Rebase von losgelöstem HEAD %s"
-#: ref-filter.c:1459
+#: ref-filter.c:1491
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(kein Branch, binäre Suche begonnen bei %s)"
+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:1467
-#, 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:1474
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD losgelöst von %s)"
-
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(kein Branch)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "kein Branch"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "Die Option `%s' ist inkompatibel mit --merged."
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "Die Option `%s' ist inkompatibel mit --no-merged."
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "Die Option `%s' muss auf einen Commit zeigen."
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
msgid "unable to open rr-cache directory"
msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "Konnte '%s' nicht löschen"
+
+#: sequencer.c:321
msgid "revert"
msgstr "Revert"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "interaktives Rebase"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "Ungültiges Datumsformat '%s' in '%s'"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "Root-Commit schreiben"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (Root-Commit)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, 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:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, 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:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "Konnte '%.*s' nicht parsen."
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "Konnte '%s' nicht lesen."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "Abbrechen eines laufenden \"cherry-pick\""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "Abbrechen eines laufenden \"revert\""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "Unbenutzbares squash-onto."
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "\"revert\" ist bereits im Gange"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "\"cherry-pick\" wird bereits durchgeführt"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
-msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
+msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, 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:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "Kein Revert im Gange"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "kein \"cherry-pick\" im Gange"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "Überspringen des Commits fehlgeschlagen"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "Nichts zum Überspringen vorhanden"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Haben Sie bereits committet?\n"
+"Versuchen Sie \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen."
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "Konnte den Index nicht lesen."
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
"ausführen.\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
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:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "Unerlaubter Beschriftungsname: '%.*s'"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "Konnte Index nicht schreiben."
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "Konnte '%s' nicht auflösen."
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "Kann nicht ohne einen aktuellen Commit mergen."
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "Konnte '%.*s' nicht parsen."
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "Nichts zum Zusammenführen: '%.*s'"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden."
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "Konnte %s nicht auschecken."
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: keine gültige OID"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"'git rebase --continue' aus.\n"
"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "Nichts zu tun."
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap fehlgeschlagen"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "Objektdatei %s ist leer."
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "Fehlerhaftes loses Objekt '%s'."
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "ungültiger Objekt-Typ"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "Konnte %s Kopfbereich nicht entpacken."
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "Konnte %s Kopfbereich nicht parsen."
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "Ersetzung %s für %s nicht gefunden."
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "Konnte Datei %s nicht schreiben."
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "Fehler beim Schreiben einer Datei."
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "Fehler beim Schließen der Datei für lose Objekte."
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
"Datenbank %s"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "Konnte temporäre Datei nicht erstellen."
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "Kann Objekt für %s nicht lesen."
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "fehlerhafter Commit"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "fehlerhaftes Tag"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "Lesefehler beim Indizieren von '%s'."
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "read() zu kurz beim Indizieren von '%s'."
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: Fehler beim Einfügen in die Datenbank"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: nicht unterstützte Dateiart"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s ist kein gültiges Objekt"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s ist kein gültiges '%s' Objekt"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "Konnte mmap nicht auf %s ausführen."
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "Konnte Kopfbereich von %s nicht entpacken."
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "Konnte Kopfbereich von %s nicht parsen."
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "Konnte Inhalt von %s nicht entpacken."
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
"erzeugt worden sein. Zum Beispiel,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u Byte"
+msgstr[1] "%u Bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u Byte/s"
+msgstr[1] "%u Bytes/s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "Die Operation wird von dem Protokoll nicht unterstützt."
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
msgid "error while running fast-import"
msgstr "Fehler beim Ausführen von 'fast-import'."
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
msgid "helper %s does not support 'push-option'"
msgstr "Remote-Helper %s unterstützt nicht 'push-option'."
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "Remote-Helper %s unterstützt kein 'force'."
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "Konnte \"fast-export\" nicht ausführen."
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "Fehler beim Ausführen von \"fast-export\"."
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "Ungültige Antwort in Referenzliste: %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "Lesen von %s fehlgeschlagen."
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "Schreiben von %s fehlgeschlagen."
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "Thread %s fehlgeschlagen."
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "Fehler beim Beitreten zu Thread %s: %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "Fehler beim Warten von Prozess %s."
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "Prozess %s fehlgeschlagen"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "Kann Thread zum Kopieren von Daten nicht starten."
msgid "empty filename in tree entry"
msgstr "leerer Dateiname in Tree-Eintrag"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
msgstr "Abbruch\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Checke Dateien aus"
+msgid "Updating files"
+msgstr "Aktualisiere Dateien"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "ungültiges '..' Pfadsegment"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' existiert nicht."
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' zeigt nicht zurück auf '%s'"
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (benutzen Sie \"git restore --staged <Datei>...\" zum Entfernen aus der "
+"Staging-Area)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
-" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
-"Area)"
+" (benutzen Sie \"git restore --source=%s --staged <Datei>...\" zum "
+"Entfernen aus der Staging-Area)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
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:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: wt-status.c:226
+#: wt-status.c:238
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:228
+#: wt-status.c:240
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:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
+" (benutzen Sie \"git restore <Datei>...\", um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:231
+#: wt-status.c:243
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:243
+#: wt-status.c:254
#, 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:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "neue Datei:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "kopiert:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "gelöscht:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "geändert:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "umbenannt:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "Typänderung:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "unbekannt:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "nicht gemerged:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "neue Commits, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:896
+#: wt-status.c:906
#, 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:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Ändern oder entfernen Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird ignoriert."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Es wurden %.2f Sekunden benötigt, um die voraus/hinterher-Werte zu "
+"berechnen.\n"
+"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1147
+#: wt-status.c:1172
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:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1151
+#: wt-status.c:1176
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:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, 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:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, 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:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, 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:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1346
+#: wt-status.c:1371
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:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1350
+#: wt-status.c:1375
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:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1369
+#: wt-status.c:1394
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:1373
+#: wt-status.c:1398
#, 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:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1383
+#: wt-status.c:1408
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:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick zurzeit im Gange."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1404
+#: wt-status.c:1429
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:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1412
+#: wt-status.c:1437
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:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revert zurzeit im Gange."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade beim Revert von Commit '%s'."
-#: wt-status.c:1431
+#: wt-status.c:1456
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:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, 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:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1456
+#: wt-status.c:1481
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:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Noch keine Commits"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"'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:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, 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:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, 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:1753
+#: wt-status.c:1778
#, 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:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, 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:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Noch keine Commits in "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "unterschiedlich"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, 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:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "Probelauf"
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1495
+#: builtin/am.c:1496
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:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
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:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1647
-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:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
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:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch', um den\n"
"fehlgeschlagenen Patch zu sehen."
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
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:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
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:2194
+#: builtin/am.c:2192
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:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "Format"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "den Patch, der gerade angewendet wird, anzeigen"
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, 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:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<Optionen>] [<Patch>...]"
msgid "bad HEAD - strange symbolic ref"
msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz."
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "Ungültige Referenz: '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "'git bisect next' ausführen"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "den Zustand der binären Suche aufräumen"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "auf erwartete Commits prüfen"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "den Zustand der binären Suche zurücksetzen"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "die Begriffe für die binäre Suche ausgeben"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "Sitzung für binäre Suche starten"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "kein Log für BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms benötigt zwei Argumente."
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state erwartet keine Argumente."
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit."
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente."
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms benötigt 3 Argumente."
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check benötigt 2 oder 3 Argumente."
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms benötigt 0 oder 1 Argument."
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "Erwarte eine Farbe: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "Muss mit einer Farbe enden."
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines."
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "Ungültiger Wert für blame.coloring."
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "Konnte Commit %s zum Ignorieren nicht finden"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Anzeige in einem Format für maschinelle Auswertung"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
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:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Unterschiede im Whitespace ignorieren"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "Commit"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Ignoriere <rev> beim Ausführen von 'blame'"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Ignoriere Commits aus <Datei>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
"eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
"von Unterschieden verwenden"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
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:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, 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/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Verarbeite Zeilen"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<Optionen>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
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:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, 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:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "nicht verwenden"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "Zeige aktuellen Branch-Namen."
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
"entfernen"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
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:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
-"Branchnamen verwendet werden."
+"Die Optionen -a und -r bei 'git branch' können nicht mit einem Branchnamen "
+"verwendet werden.\n"
+"Wollten Sie -a|-r --list <Muster> benutzen?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
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:642
+#: builtin/cat-file.c:643
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:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "Blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
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:653
+#: builtin/cat-file.c:654
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:657
+#: builtin/cat-file.c:658
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:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "Ausgabe von --batch-all-objects nicht ordnen"
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:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
msgstr "den Inhalt in temporäre Dateien schreiben"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "Zeichenkette"
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<Optionen>] <Branch>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<Optionen>] [<Branch>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d Merge-Konflikt wieder erstellt"
+msgstr[1] "%d Merge-Konflikte wieder erstellt"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d Pfad von %s aktualisiert"
+msgstr[1] "%d Pfade von %s aktualisiert"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d Pfad vom Index aktualisiert"
+msgstr[1] "%d Pfade vom Index aktualisiert"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, 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:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "Pfad '%s' ist nicht zusammengeführt."
+msgid "neither '%s' or '%s' is specified"
+msgstr "Weder '%s' noch '%s' ist angegeben"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "%d Merge-Konflikt wieder erstellt"
-msgstr[1] "%d Merge-Konflikte wieder erstellt"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "%d Pfad von %s aktualisiert"
-msgstr[1] "%d Pfade von %s aktualisiert"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "%d Pfad vom Index aktualisiert"
-msgstr[1] "%d Pfade vom Index aktualisiert"
+msgid "path '%s' is unmerged"
+msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
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:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
"Zum Commit vorgemerkte Änderungen in den folgenden Dateien gehen eventuell "
"verloren: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, 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:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "nur eine Referenz erwartet"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
"eindeutig voneinander zu unterscheiden."
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "Ein Branch wird erwartet, '%s' bekommen"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines Merges gewechselt werden.\n"
+"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'am'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'cherry-pick'-Befehls "
+"gewechselt werden.\n"
+"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Der Branch kann nicht während eines laufenden 'revert'-Befehls gewechselt "
+"werden.\n"
+"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "Sie wechseln den Branch während einer binären Suche"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' kann nicht <Startpunkt> bekommen"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "Branch"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "Branch- oder Commit-Argument fehlt"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "einen neuen Branch erzeugen und auschecken"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "einen Branch erstellen/umsetzen und auschecken"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "das Reflog für den neuen Branch erzeugen"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "Stil"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1366
-msgid "checkout our version for unmerged files"
-msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-
-#: builtin/checkout.c:1369
-msgid "checkout their version for unmerged files"
-msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
+#: builtin/checkout.c:1459 builtin/merge.c:288
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "Stil"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "Konfliktstil (merge oder diff3)"
-
-#: builtin/checkout.c:1381
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "kein zweites Erraten bei 'git checkout <kein-solcher-Branch>'"
-
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1462
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:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "Fortschrittsanzeige erzwingen"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "benutze Overlay-Modus (Standard)"
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p und --overlay schließen sich gegenseitig aus."
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "Kein Branchname; versuchen Sie -b."
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "Konnte %s nicht auflösen."
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
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:1495
+#: builtin/checkout.c:1642
#, 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:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"bevorzugen möchten, z.B. 'origin', könnten Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "Branch"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "einen neuen Branch erzeugen und auschecken"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "einen Branch erstellen/umsetzen und auschecken"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "das Reflog für den neuen Branch erzeugen"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "benutze Overlay-Modus (Standard)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "einen neuen Branch erzeugen und dahin wechseln"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "lokale Änderungen verwerfen"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "Index wiederherstellen"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignoriere nicht zusammengeführte Einträge"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "benutze Overlay-Modus"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "Konnte 'lstat' nicht für %s ausführen\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
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:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Würde das folgende Element entfernen:"
msgstr[1] "Würde die folgenden Elemente entfernen:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "Pfadspezifikation"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "Name"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
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:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
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:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
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:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "serverspezifisch"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "Option übertragen"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, 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:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "Fehler beim Öffnen von '%s'"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "Konnte %s nicht lesen\n"
+msgid "failed to start iterator over '%s'"
+msgstr "Fehler beim Starten der Iteration über '%s'"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "Fehler beim Iterieren über '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Klonen erfolgreich, Auschecken ist aber fehlgeschlagen.\n"
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
-"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
+"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
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:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, 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:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
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:1108
+#: builtin/clone.c:1126
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:1110
+#: builtin/clone.c:1128
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:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
msgid "duplicate parent %s ignored"
msgstr "doppelter Vorgänger %s ignoriert"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "Kein gültiger Objektname: %s"
msgid "id of a parent commit object"
msgstr "ID eines Eltern-Commit-Objektes."
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "Commit-Beschreibung"
msgid "read commit log message from file"
msgstr "Commit-Beschreibung von Datei lesen"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
+"Und dann nutzen Sie:\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
+"\n"
+"um das Cherry-Picking mit den übrigen Commits fortzusetzen.\n"
+"Wenn dieser Commit übersprungen werden soll, nutzen Sie:\n"
+"\n"
+" git cherry-pick --skip\n"
"\n"
-"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
-"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
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:454
+#: builtin/commit.c:457
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:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, 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:1027
+#: builtin/commit.c:1030
#, 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:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
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:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
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:1144
+#: builtin/commit.c:1160
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:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
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:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
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:1184
+#: builtin/commit.c:1200
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:1186
+#: builtin/commit.c:1202
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:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
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:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, 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:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"Das Repository wurde aktualisiert, aber die \"new_index\"-Datei\n"
"konnte nicht geschrieben werden. Prüfen Sie, dass Ihre Festplatte nicht\n"
"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
-"anschließend \"git reset HEAD\" zu Wiederherstellung aus."
+"anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <Objektverzeichnis>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--"
-"reachable|--stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] "
+"[--reachable|--stdin-packs|--stdin-commits] <Split-Optionen>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Das Objektverzeichnis zum Speichern des Graphen."
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Konnte Commit-Graph '%s' nicht öffnen."
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "Durchlauf auf allen Referenzen beginnen"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
"befinden"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"Maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"Maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-"
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "nicht erkanntes --type Argument, %s"
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "Wert ist mit diesem Typ angegeben"
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "Wert"
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "Art"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `"
+"%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--"
+"type=ulong`, nicht `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Kennzeichen in diese Datei schreiben"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Kennzeichen von dieser Datei importieren"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
"referenzieren"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "das Überschreiben einer lokalen Referenz erzwingen"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
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:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
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:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
"sind"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "Führe 'gc --auto' nach \"fetch\" aus"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Normalerweise zeigt 'fetch' welche Branches eine erzwungene Aktualisierung\n"
+"hatten, aber diese Überprüfung wurde deaktiviert. Um diese wieder zu\n"
+"aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n"
+"Sie 'git config fetch.showForcedUpdates true' aus."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Es brauchte %.2f Sekunden, um erzwungene Aktualisierungen zu überprüfen.\n"
+"Sie können die Option '--no-show-forced-updates' benutzen oder\n"
+"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
+"zu umgehen.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter kann nur mit den Remote-Repositories verwendet werden,\n"
"die in core.partialClone konfiguriert sind."
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
+"Die Option --unshallow kann nicht in einem Repository mit vollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
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/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "Formatfarben beachten"
msgid "Checking %s link"
msgstr "Prüfe %s Verknüpfung"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Prüfe Objekte"
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, 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:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
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:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "Kein Muster angegeben."
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
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:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
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:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "Die Option wird mit --recurse-submodules nicht unterstützt."
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached und --untracked können nicht mit --no-index verwendet werden."
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
"werden."
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "Art"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "Art des Objektes"
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "Für '%s' wurde der Alias '%s' angelegt."
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Ungültiger alias.%s String: %s"
msgid "'git help config' for more information"
msgstr "'git help config' für weitere Informationen"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, 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:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
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:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "Paket überschreitet die maximal erlaubte Größe"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr ""
"Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, 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:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelösten Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, 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:1623
+#: builtin/index-pack.c:1643
#, 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:1630
+#: builtin/index-pack.c:1650
#, 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:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "fsck Fehler beim Packen von Objekten"
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:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<Token>[(=|:)<Wert>])...] [<Datei>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "vorhandene Dateien direkt bearbeiten"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "kürzt leere Anhänge"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "wo der neue Anhang platziert wird"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "Aktion, wenn Anhang bereits existiert"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "Aktion, wenn Anhang fehlt"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "nur Anhänge ausgeben"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "Regeln aus Konfiguration nicht anwenden"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "Optionen für das Parsen setzen"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "--- nicht speziell behandeln"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "Anhang"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "Anhang/Anhänge hinzufügen"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
"werden."
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:177
+#: builtin/log.c:182
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:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"'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:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "Fehler beim Ableiten des range-diff-Bereichs."
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
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:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "Header"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
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:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "Forschrittsanzeige während der Erzeugung der Patches"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "Commit"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff gegen v%d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor erfordert --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-Diff:"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-Diff gegen v%d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Erzeuge Patches"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "Programm"
#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-"mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n"
+"mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
"gefunden wurden"
#: builtin/ls-remote.c:75
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "Option `%s' erfordert einen Wert."
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
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:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
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:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
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:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
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:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "commit-msg Hook überprüfen"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, 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:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
"und eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, 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:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
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:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, 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:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit erwartet keine Argumente"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"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:1327
+#: builtin/merge.c:1334
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:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Sie können --squash nicht mit --commit kombinieren."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
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:1368
+#: builtin/merge.c:1385
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:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
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:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Bereits aktuell."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Bereits aktuell."
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, 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:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|"
+"repack --batch-size=<Größe>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
+"einenStapel, welcher größer ist als diese Größe"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "Zu viele Argumente."
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "Option --batch-size ist nur für den Unterbefehl 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "Nicht erkanntes Verb: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "Nicht erkannter Unterbefehl: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<Optionen>] <Commit>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<Optionen>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<Optionen>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "nur Namen anzeigen (keine SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "nur Tags verwenden, um die Commits zu benennen"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignoriere Referenzen die <Muster> entsprechen"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "von der Standard-Eingabe lesen"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "Ungültiges CRC für gepacktes Objekt %s."
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "Fehlerhaftes gepacktes Objekt für %s."
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "Packdatei ist ungültig: %s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen."
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "Konnte nicht von wiederverwendeter Packdatei lesen."
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
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:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
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:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Zähle Objekte"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "Konnte Größe von %s nicht bestimmen."
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"Erwartete Objekt-ID, erhielt nutzlose Daten:\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "Ungültiger Wert für --missing."
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "Kann Paketindex nicht öffnen."
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "Loses Objekt bei %s konnte nicht untersucht werden."
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "Konnte loses Objekt nicht erzwingen."
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' ist kein Commit."
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "Ungültiger Commit '%s'."
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "Konnte jüngste Objekte nicht hinzufügen."
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
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:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
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:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
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:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
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:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
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:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
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:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "Bitmap-Index schreiben, wenn möglich"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
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:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 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:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 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:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 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:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
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:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
msgid "keep empty commits"
msgstr "leere Commits behalten"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "Commits mit leerer Beschreibung erlauben"
msgid "sign commits"
msgstr "Commits signieren"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
msgid "the command to run"
msgstr "auszuführender Befehl"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s erfordert ein interaktives Rebase"
msgid "Cannot store %s"
msgstr "Kann %s nicht speichern."
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "Konnte HEAD-Commit nicht bestimmen."
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
"ausführen."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<Branch>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "Leerer \"exec\"-Befehl."
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "an 'git am' übergeben"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "fortsetzen"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "leere Commits während des Rebase erhalten"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "automatischer Stash/Stash-Pop davor und danach"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "Option"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n"
"Siehe dessen Eintrag in 'git help config' für Details."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
"rebase-merges'."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "Konnte '%s' nicht löschen"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder "
"\"merge\" kombiniert werden."
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
"kombiniert werden."
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
"'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden."
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "'--rebase-merges' kann nicht mit '--strategy' kombiniert werden."
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: Branch/Commit '%s' nicht gefunden"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen."
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Unerwartete 'stash'-Antwort: '%s'"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Automatischen Stash erzeugt: %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "Konnte 'reset --hard' nicht ausführen."
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "Konnte nicht zu %s wechseln."
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
"anzuwenden...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht starten."
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht abschließen."
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
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:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Nichts Neues zum Packen."
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNUNG: ebenfalls fehl.\n"
"WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "Fehler beim Löschen von '%s'"
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "Das Filtern von Objekten erfordert --objects."
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "Ungültiger \"sparse\"-Wert '%s'."
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
msgid "cancel revert or cherry-pick sequence"
msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "den aktuellen Commit auslassen und fortfahren"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "nicht automatisch committen"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "Commit-Beschreibung bearbeiten"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "Nummer des Elternteils"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "Elternteil der Hauptlinie auswählen"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "Merge-Strategie"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "Option für Merge-Strategie"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "Commit-Namen anhängen"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "ursprüngliche, leere Commits erhalten"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
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:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "keine übereinstimmenden Referenzen mit %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches anzeigen"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "Remote-Tracking-Branches anzeigen"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "'*!+-' entsprechend des Branches einfärben"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "Synonym für more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "Namen unterdrücken"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "den aktuellen Branch einbeziehen"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "Commits nach ihren Objektnamen benennen"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mögliche Merge-Basen anzeigen"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
"Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "Commits in topologischer Ordnung anzeigen"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<Basis>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
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:712
+#: builtin/show-branch.c:711
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:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "keine Branches angegeben, und HEAD ist ungültig"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "Die Option --reflog benötigt einen Branchnamen."
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, 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:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' ist keine gültige Referenz."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "kann Commit %s (%s) nicht finden"
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kann nicht %s mit %s aktualisieren."
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "Stash-Beschreibung"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" erwartet ein Argument <Commit>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
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"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Haben Sie vielleicht 'git add' vergessen?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "behalte Index"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "Stash in Patch-Modus"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "weniger Ausgaben"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "ignorierte Dateien einbeziehen"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "Konnte 'exec %s' nicht ausführen."
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
"run_command gab nicht-Null Status für '%s' zurück.\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"nicht-Null Status zurück.\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
"Ausgaben beim Betreten und der Befehlsausführung in einem Submodul "
"unterdrücken"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
"Repository sein eigenes verbindliches Upstream-Repository ist."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
"Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
"Konfiguration."
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul '%s'."
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Ausgabe über Submodul-Status unterdrücken"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisiere Submodul-URL für '%s'\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'."
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'."
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
"löschen möchten)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
"vorliegen"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "alle Submodule austragen"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
"möchten."
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt."
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
"ob das initiale Klonen den Empfehlungen für eine unvollständige\n"
"Historie (shallow) folgen soll"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
"Arbeitsverzeichnis befindet."
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Die Option -n ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:502
+#: builtin/tag.c:512
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:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <Commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "Commit-Inhalte ausgeben"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
msgid "show statistics only"
msgstr "nur Statistiken anzeigen"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "Fehler beim Löschen von '%s'"
"Benutzen Sie 'add -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n"
"Löschen."
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
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:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
"Remote-Tracking-Branch herzustellen"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
"gesperrt ist"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "Konnte Zielname aus '%s' nicht bestimmen."
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "Ziel '%s' existiert bereits."
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
"ist"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' und 'git help -g' listet verfügbare Unterbefehle und\n"
"einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Befehl>'\n"
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
-"Konzept zu erfahren."
+"Konzept zu erfahren.\n"
+"Benutzen Sie 'git help git' für einen Überblick des Systems."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "Kein Namespace für --namespace angegeben.\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "Kein Präfix für --super-prefix angegeben.\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c erwartet einen Konfigurationsstring.\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "Kein Verzeichnis für -C angegeben.\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "Unbekannte Option: %s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "beim Erweitern von Alias '%s': '%s'"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"Alias '%s' ändert Umgebungsvariablen.\n"
"Sie können '!git' im Alias benutzen, um dies zu tun."
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "leerer Alias für %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "rekursiver Alias: %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "Fehler beim Schließen der Standard-Ausgabe."
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "Kann %s nicht als eingebauten Befehl behandeln."
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"Verwendung: %s\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
msgid "no-op (backward compatibility)"
msgstr "Kein Effekt (Rückwärtskompatibilität)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr "erweiterte Ausgaben"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr "weniger Ausgaben"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Dateiinhalte zum Commit vormerken"
msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "einige bestehende Commits rückgängig machen"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Parameter herauspicken und ändern"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "eine Sammlung von Patches als E-Mails versenden"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Ausgabe von 'git log' zusammenfassen"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "verschiedene Arten von Objekten anzeigen"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Branches und ihre Commits ausgeben"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "gepackten Archiv-Index anzeigen"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Referenzen in einem lokales Repository auflisten"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Git's i18n-Konfigurationscode für Shell-Skripte"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Dateiinhalte der Staging-Area hinzufügen"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "nicht erforderlichen Whitespace entfernen"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
"Bidirektionale Operationen zwischen einem Subversion Repository und Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Branches wechseln"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "symbolische Referenzen lesen, ändern und löschen"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
"verifizieren."
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Objekte von einem gepackten Archiv entpacken"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Archiv zurück zu git-archive senden"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Objekte gepackt zurück an git-fetch-pack senden"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "eine logische Variable von Git anzeigen"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "die GPG-Signatur von Commits prüfen"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "gepackte Git-Archivdateien validieren"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "die GPG-Signatur von Tags prüfen"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "mehrere Arbeitsverzeichnisse verwalten"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Tree-Objekt vom aktuellen Index erstellen"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Git Kommandozeilenschnittstelle und Konventionen"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "eine Git Anleitung für Entwickler"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git für CVS Benutzer"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Diff-Ausgabe optimieren"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
"ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "ein Git-Glossar"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "von Git verwendete Hooks"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git Namensbereiche"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Git Repository Aufbau"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "eine einführende Anleitung zu Git: Teil zwei"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "eine einführende Anleitung zu Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"'bisect run' fehlgeschlagen:\n"
-"Rückkehrwert $res von '$command' ist < 0 oder >= 128"
+"Exit-Code $res von '$command' ist < 0 oder >= 128"
#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgid "See git-${cmd}(1) for details."
msgstr "Siehe git-${cmd}(1) für weitere Details."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Automatischen Stash angewendet."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Kann $stash_sha1 nicht speichern."
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Führe Rebase aus ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: kein Commit der gepickt werden kann"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Ungültiger Commit-Name: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Spule vor zu $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kann nicht zu $sha1 vorspulen"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kann HEAD nicht auf $first_parent setzen"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fehler beim Wiederholen des Merges von $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Konnte $sha1 nicht picken"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Das ist Commit-Beschreibung #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Das ist eine Kombination aus $count Commit."
msgstr[1] "Das ist eine Kombination aus $count Commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kann $fixup_msg nicht schreiben"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Das ist eine Kombination aus 2 Commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Konnte $sha1... ($rest) nicht anwenden"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
"können."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Angehalten bei $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Führe aus: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ausführung fehlgeschlagen: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"ausführen."
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Unbekannter Befehl: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
"finden"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"erneut\n"
"aus."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Kein HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
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:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%28s %25s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "Binär"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "Nichts"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "unverändert"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, 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:612
+#: git-add--interactive.perl:626
#, 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:615
+#: git-add--interactive.perl:629
#, 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:618
+#: git-add--interactive.perl:632
#, 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:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualisieren"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Revert"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "unversionierte Dateien hinzufügen"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Block\n"
"direkt als zum Hinzufügen zur Staging-Area markiert."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Block\n"
"direkt als zum Hinzufügen zum Stash markiert."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Block\n"
"direkt als zum Entfernen aus der Staging-Area markiert."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Block\n"
"direkt als zum Anwenden markiert."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Block\n"
"direkt als zum Verwerfen markiert."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, 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:1086
+#: git-add--interactive.perl:1110
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:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"Zeilen, die mit %s beginnen, werden entfernt.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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"
"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, 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"
#. 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:1213
+#: git-add--interactive.perl:1237
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:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
+"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n"
+"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
+"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
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:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, 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:1391
+#: git-add--interactive.perl:1427
#, 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:1392
+#: git-add--interactive.perl:1428
#, 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:1395
+#: git-add--interactive.perl:1431
#, 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:1396
+#: git-add--interactive.perl:1432
#, 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:1397
+#: git-add--interactive.perl:1433
#, 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:1400
+#: git-add--interactive.perl:1436
#, 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:1401
+#: git-add--interactive.perl:1437
#, 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:1402
+#: git-add--interactive.perl:1438
#, 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:1405
+#: git-add--interactive.perl:1441
#, 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:1406
+#: git-add--interactive.perl:1442
#, 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:1407
+#: git-add--interactive.perl:1443
#, 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:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, 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:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, 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:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, 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:1415
+#: git-add--interactive.perl:1451
#, 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:1416
+#: git-add--interactive.perl:1452
#, 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:1417
+#: git-add--interactive.perl:1453
#, 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:1420
+#: git-add--interactive.perl:1456
#, 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:1421
+#: git-add--interactive.perl:1457
#, 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:1422
+#: git-add--interactive.perl:1458
#, 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:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Keine anderen Patch-Blöcke verbleibend\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, 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:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Diff überprüfen"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "-- fehlt"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
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:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "Der Editor wurde unsauber beendet, breche alles ab."
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, 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:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' enthält die verfasste E-Mail.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
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:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"Kommandozeile\n"
"oder Konfigurationsoption)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Unbekannte --confirm Einstellung: '%s'\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, 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:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
"meinen\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal: %s: %s\n"
"Warnung: Es wurden keine Patches versendet.\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"keine Patch-Dateien angegeben!\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Keine Betreffzeile in %s?"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
"möchten.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fehler beim Öffnen von %s.final: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
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:831
+#: git-send-email.perl:858
#, 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:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
"Content-Transfer-Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
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:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
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:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
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:1018
+#: git-send-email.perl:1045
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:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA Pfad \"%s\" existiert nicht"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
"Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
"[a]): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Server unterstützt kein STARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS fehlgeschlagen! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
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:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fehler beim Senden %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Probeversand %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "%s gesendet\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Probeversand OK. Log enthält:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Log enthält:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Ergebnis: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, 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:1638
+#: git-send-email.perl:1665
#, 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:1691
+#: git-send-email.perl:1718
#, 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:1726
+#: git-send-email.perl:1753
#, 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:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "Kann Nachricht nicht als 7bit versenden."
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "Ungültiges Transfer-Encoding"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "konnte %s nicht öffnen: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, 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:1947
+#: git-send-email.perl:1974
#, 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:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
+
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "'fetch' zeigt normalerweise, welche Branches eine erzwungene "
+#~ "Aktualisierung hatten, aber diese Überprüfung wurde deaktiviert."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "oder führen Sie 'git config fetch.showForcedUpdates false' aus, um diese "
+#~ "Überprüfung zu umgehen.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "'log.mailmap' ist nicht gesetzt; der implizite Wert wird sich in einem\n"
+#~ "kommenden Release ändern. Um diese Meldung zu unterdrücken und das "
+#~ "aktuelle\n"
+#~ "Verhalten beizubehalten, setzen Sie den Konfigurationswert von'log."
+#~ "mailmap' auf 'false'.\n"
+#~ "\n"
+#~ "Um diese Meldung zu unterdrücken und jetzt das neue Verhalten zu\n"
+#~ "übernehmen, setzen Sie den Konfigurationswert von 'log.mailmap' auf "
+#~ "'true'.\n"
+#~ "\n"
+#~ "Führen Sie 'git help config' aus und suchen Sie nach 'log.mailmap', um\n"
+#~ "weitere Informationen zu erhalten."
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Server unterstützt multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Server unterstützt no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Server unterstützt multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Server unterstützt side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Server unterstützt side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Server unterstützt allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Server unterstützt allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Server unterstützt ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD losgelöst bei %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD losgelöst von %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checke Dateien aus"
+
+#~ 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."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "Fehler beim Öffnen von '%s'"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "Konnte %s nicht lesen\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
+#~ "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "Nicht erkanntes Verb: %s"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-04 18:51-0500\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-10 12:55-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No es posible %s porque tienes archivos sin fusionar."
-#: advice.c:174
+#: advice.c:180
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."
"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
"como sea apropiado, para marcar la resolución y realizar un commit."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Nota: actualizando el árbol de trabajo '%s'.\n"
+"Nota: cambiando a '%s'.\n"
"\n"
"Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n"
-"cambios experimentales y confirmarlos, y puedes descartar cualquier\n"
+"cambios experimentales y hacer commits, y puedes descartar cualquier\n"
"commit que hayas hecho en este estado sin impactar a tu rama realizando\n"
"otro checkout.\n"
"\n"
"Si quieres crear una nueva rama para mantener los commits que has creado,\n"
-"puedes hacerlo (ahora o después) usando -b con el comando checkout. "
+"puedes hacerlo (ahora o después) usando -c con el comando checkout. "
"Ejemplo:\n"
"\n"
-" git checkout -b <nombre-de-nueva-rama>\n"
+" git switch -c <nombre-de-nueva-rama>\n"
+"\n"
+"O deshacer la operación con:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Apaga este aviso mediante la variable de config advice.detachedHead en "
+"false\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "comillas incompletas"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opción de espacios en blanco no reconocida '%s'"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject y --3way no se pueden utilizar juntas."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached y --3way no se pueden utilizar juntas."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way está fuera de un repositorio"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index está fuera de un repositorio"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached está fuera de un repositorio"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec devolvió %d para la entrada: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
"no se puede encontrar el nombre del archivo en el parche en la línea %d"
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en "
"lalínea %d"
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en "
"lalínea %d"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en "
"lalínea %d"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "modo inválido en la línea %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "header inconsistente en las líneas %d y %d"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: línea inesperada: %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragmento de parche sin header en la línea %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"los headers de git diff carecen de información de los nombres de los "
"archivos %d cuando los eliminan de la ruta principal componentes (línea %d)"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"el header de git diff carece de información del nombre del archivo (línea %d)"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "el nuevo archivo depende de contenidos viejos"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "el archivo eliminado todavía tiene contenido"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "parche corrupto en la línea %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nuevo archivo %s depende en contenidos viejos"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "el archivo borrado %s todavía tiene contenido"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** peligro: el archivo %s está vacío pero no es borrado"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "parche binario corrupto en la línea %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "parche binario no reconocido en la línea %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "parche que solo contiene basura en la línea %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "no es posible leer el enlace simbólico %s"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "no es posible abrir o leer %s"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "comienzo inválido de línea: '%c'"
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"mientras se busca:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "data perdida en parche binario para '%s'"
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
"actuales."
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "la postimagen necesaria %s para '%s' no se puede leer"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el parche binario no aplica para '%s'"
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
"obtuvo %s)"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el parche falló: %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "leyendo de '%s' tras un enlace simbólico"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "la ruta %s ha sido renombrada/suprimida"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existe en el índice"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el índice"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"el repositorio carece del blob necesario para regresar en un merge de tres-"
"vías."
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retrocediendo en un merge de tres-vías...\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "no se pueden leer los contenidos actuales de '%s'"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Falló el merge en retroceso de tres-vías...\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Parche aplicado a '%s' con conflictos.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Parche aplicado a '%s' limpiamente\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "parche de remoción deja contenidos en el archivo"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo incorrecto"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "ruta inválida '%s'"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el índice"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' está tras un enlace simbólico"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta información del sha1 o es inútil para el submódulo %s"
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta información sha1 o es inútil (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry falló para la ruta '%s'"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo añadir %s al índice temporal"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un índice temporal para %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede eliminar %s del índice"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submódulo %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible establecer el archivo recién creado '%s'"
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no es posible crear una copia de seguridad para el archivo recién creado %s"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "falló escribir para '%s'"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "error interno"
-#: apply.c:4549
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Hunk #%d rechazado."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "no es posible leer el archivo índice"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco aplastado"
msgstr[1] "%d errores de espacios en blanco aplastados"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línea agrega errores de espacios en blanco."
msgstr[1] "%d líneas agregan errores de espacios en blanco."
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[1] ""
"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "ruta"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "num"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche es aplicable al índice actual"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca los nuevos archivos con `git add --intent-to-add`"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el árbol de trabajo"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toca fuera del área de trabajo"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "intentar merge de tres-vías si el parche no aplica"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir un índice temporal basado en la información del índice incrustado"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "acción"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detectar líneas nuevas o modificadas que contienen errores de espacios en "
"blanco"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "no espera al menos una línea del contexto"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
"archivo"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de líneas en los headers del hunk"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "raíz"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
msgid "not a tree object: %s"
msgstr "no es un objeto tree: %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "directorio de trabajo actual no rastreado"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "formato del archivo"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "prefijo"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en el archivo"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "carpeta"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escribe el archivo en esta carpeta"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "leer .gitattributes en el directorio de trabajo"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "reportar archivos archivados por stderr"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "solo guardar"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
-msgstr "comprimir mas rápido"
+msgstr "comprimir más rápido"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "comprimir mejor"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "repo"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archivo remoto"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opción inesperada --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Opción --exec solo puede ser utilizada con --remote"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opción inesperada --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de carpeta desconocido '%s'"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soportado para formato '%s': -%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "error al desinflar (%d)"
#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
-msgstr "%.*s no es un nombre de atributo valido"
+msgstr "%.*s no es un nombre de atributo válido"
#: attr.c:368
#, c-format
#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
-msgstr "No es un nombre de commit valido %s"
+msgstr "No es un nombre de commit válido %s"
#: bisect.c:758
#, c-format
msgstr ""
"Algunas %s revisiones no son ancestros de la revisión %s.\n"
"git bisect no puede trabajar bien en este caso.\n"
-"Tal vez confundió la revisión %s y %s?\n"
+"Tal vez confundiste la revisión %s y %s?\n"
#: bisect.c:789
#, c-format
msgid "a %s revision is needed"
msgstr "una %s revisión es necesaria"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents y --reverse no se mezclan bien."
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "no se puede usar --contents con el nombre de objeto commit final"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "falló la configuración del camino de revisión"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
"del primer padre"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "no hay una ruta %s en %s"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no se puede leer el blob %s para la ruta %s"
#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
-msgstr "'%s' no es un nombre valido de rama."
+msgstr "'%s' no es un nombre válido de rama."
#: branch.c:208
#, c-format
#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
-msgstr "Nombre de objeto no valido: '%s'."
+msgstr "Nombre de objeto no válido: '%s'."
#: branch.c:301
#, c-format
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "Punto de rama no valido: '%s'."
+msgstr "Punto de rama no válido: '%s'."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ya ha sido marcado en '%s'"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD del árbol de trabajo %s no está actualizada"
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositorio le falta estos commits prerrequisito:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "se necesita un repositorio para verificar un bundle"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El bundle contiene esta referencia:"
msgstr[1] "El bundle contiene estas %d referencias:"
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "El bundle registra una historia completa."
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El bundle requiere esta referencia:"
msgstr[1] "El bundle requiere estas %d referencias:"
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "incapaz de duplicar bundle descriptor"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "No se pudo crear los pack-objetcts"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects murió"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list murió"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Rechazando crear un bundle vacío."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "no se puede crear '%s'"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack murió"
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "no se puede analizar %s"
msgid "%s %s is not a commit!"
msgstr "%s %s no es un commit!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Apapa este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "El Commit %s tiene una buena firma GPG por %s\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
-"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
"variable de configuración i18n.commitencoding para la codificación que usa "
-"su proyecto.\n"
+"tu proyecto.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "archivo commit-graph es muy pequeño"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "firma %X en commit-graph no concuerda con firma %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "versión de commit-graph %X no concuerda con versión %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
"incompleto"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph no tiene una chunk base de graphs"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "cadena commit-graph no concuerda"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "no es posible encontrar los archivos commit-graph"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Encontrando commits para commit graph en %d pack"
msgstr[1] "Encontrando commits para commit graph en %d packs"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Encontrando commits para commit graph de %d ref"
msgstr[1] "Encontrando commits para commit graph de %d refs"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Contando commits distintos en commit graph"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "el formato de gráficos de commit no pudede escribir %d commits"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "demasiados commits para escribir el gráfico"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "falló al escribir el número correcto de ids de base graph"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Escribiendo commit graph en %d paso"
msgstr[1] "Escribiendo commit graph en %d pasos"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "no se pudo abrir la cadena de archivos commit-graph"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "no se pudo renombrar el archivo base commit-graph"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "falló al renombrar el archivo temporal commit-graph"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Escaneando commits fusionados"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de commit duplicado inesperado %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Fusionando commit-graph"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "demasiados commits para escribir el gráfico"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"falló al analizar el commit %s de la base de datos de objetos para commit-"
"graph"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista padre de commit-graph para commit %s es muy larga"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista padre de commit-graph para commit %s termina antes"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
"commit-graph ha generado número cero para %s, pero no-cero para los demás"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
"commit-graph tiene generación no-cero para %s, pero cero para los demás"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "generación commit-graph para commit %s es %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"la configuración relativa incluye condicionales que deben venir de archivos"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala línea de config %d en el blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala línea de config %d en el archivo %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala línea de config %d en la entrada standard"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "mala línea de config %d en el submódulo-blob %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "mala línea de config %d en la línea de comando %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numérica '%s' para '%s': %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falló al expandir el directorio de usuario en: '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' para '%s' no es una marca de tiempo válida"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "largo de abreviatura fuera de rango: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar debería tener solo un caracter"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz de cargar configuración de objeto blob '%s'"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no se posible resolver configuración de blob '%s'"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
-msgstr "Invalido %s: '%s'"
+msgstr "Inválido %s: '%s'"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
"defecto"
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "no es posible hacer mmap '%s'"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "sección de nombre inválida: %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
msgstr ""
"No se pudo leer del repositorio remoto.\n"
"\n"
-"Por favor asegúrese que tiene los permisos de acceso correctos\n"
+"Por favor asegúrate que tienes los permisos de acceso correctos\n"
"y que el repositorio existe."
#: connect.c:81
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d islas marcadas, listo.\n"
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"muestra la distribución de cantidades de cambios relativa para cada "
"subdirectorio"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"advierte si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino en lugar de \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"muestra el contexto entre hunks de diff hasta el número especificado de "
"líneas"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<char>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "continua listando el historial de un archivo más allá de renombres"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
"paths relativos"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<string>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<id-objeto>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber muchos archivos."
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"tal vez quiera configurar la variable %s para por lo menos %d y volver a "
+"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
"intentar el comando."
#: dir.c:537
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea poco profunda inválida: %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "listo"
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "El servidor no soporta clientes superficiales"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "El servidor soporta ulti_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "El servidor soporta no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "El servidor soporta multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "El servidor soporta side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "El servidor soporta side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "El servidor soporta allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "El servidor soporta allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "El servidor soporta ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "El servidor soporta filtro"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "El servidor soporta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "El servidor no soporta clientes superficiales"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shalow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shalow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "El servidor soporta filtro"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "error leyendo sección header '%s'"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr "linea de confirmación inesperada: '%s'"
+msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "error procesando acks: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "espere que el packfile sea mandado luego del 'listo'"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "error procesando información superficial: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error procesando refs deseadas: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg falló al firmar la data"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora color inválido '%.*s' en log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "falló al marcar '%s'"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
msgid "These are common Git commands used in various situations:"
msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "comando de listado de tipos no soportado '%s'"
"The most similar commands are"
msgstr[0] ""
"\n"
-"El comando mas similar es"
+"El comando más similar es"
msgstr[1] ""
"\n"
-"Los comandos mas similares son"
+"Los comandos más similares son"
#: help.c:714
msgid "git version [<options>]"
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
msgid "sparse:path filters support has been dropped"
msgstr "soporte para filtros sparse:path ha sido discontinuado"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtro -spec inválido '%s'"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "no se puede cambiar un clon parcial remoto promisor"
msgid "failed to read the cache"
msgstr "falló al leer la cache"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
msgid "error building trees"
msgstr "error construyendo árboles"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falló al crear la ruta '%s'%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": tal vez un conflicto D/F?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "rehusando perder el archivo rastreado en '%s'"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "no se puede leer el objeto %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "se esperaba blob para %s '%s'"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "falló al abrir '%s': %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falló al crear el enlace simbólico '%s': %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se que hacer con %06o %s '%s'"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Falló al fusionar el submódulo %s (no revisado)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rápido en submódulo %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"el cual aceptará esta sugerencia.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Falló al ejecutar la fusión interna"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "No es posible agregar %s a la base de datos"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Auto-fusionando %s"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
"cambio."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
"en el árbol."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
"dejada en el árbol, en %s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
"permanece en el árbol en %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "renombrar"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Rehusando perder el archivo sucio en %s"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
"interponiendo."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s es un directorio en %s agregando como %s más bien"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
"renombrar \"%s\"->\"%s\" en \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
"%s"
-#: merge-recursive.c:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"colocar %s porque el directorio %s fue renombrado a otros múltiples "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"existente en %s se interpone con el cambio de nombres implícito, poniendo "
"la(s) siguiente(s) ruta(s) aquí: %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
"renombrado."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "contenido"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Path actualizado: %s agregado en %s dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
"que fue renombrado en %s, sugerimos que debería ser movido a %s."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
"movido a %s."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
"%s"
-#: merge-recursive.c:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"merge:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "¡Ya está actualizado!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "archivo multi-pack-index %s es muy pequeño"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versión %d de multi-pack-index no reconocida"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "versión de hash %u no concuerda"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "offset inválido del conjunto (muy grande)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"terminando multi-pack-index porque el id del conjunto aparece antes de lo "
"esperado"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index le falta el conjunto pack-name requerido"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "error preparando packfile de multi-pack-index"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió pack-file %s caer"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Buscando por packfiles referidos"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Verificando orden de OID en MIDX"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "no se pudo empezar los pack-objetcts"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "no se pudo finalizar pack-objetcts"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "no es posible crear hilo lazy_dir: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "no es posible crear hilo lazy_name: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "no es posible unir hilo lazy_name: %s"
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
#: parse-options.c:863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
-msgstr "opcion desconocida en string no ascii: `%s'"
+msgstr "opción desconocida en string no ascii: `%s'"
#: parse-options.c:887
msgid "..."
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "no se pudo leer output de `log`"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "no se puede analizar git header '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "falló al generar diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "no se pudo leer el log para '%s'"
msgstr "entradas de stage desordenadas para '%s'"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "archivo índice corrompido"
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
msgstr[0] "Rebase %s en %s (%d comando)"
msgstr[1] "Rebase %s en %s (%d comandos)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"\n"
"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
"\n"
-"Esta editando el archivo TODO de un rebase interactivo.\n"
-"Para continuar el rebase después de editar, ejecute:\n"
+"Estás editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase después de editar, ejecuta:\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Tenga en cuenta que los commits vacíos están comentados"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
"Dropped commits (newer to older):\n"
msgstr ""
"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
-"Commits botados (empezando con el mas nuevo):\n"
+"Commits botados (empezando con el más nuevo):\n"
#: rebase-interactive.c:180
#, c-format
"Los posibles comportamientos son: ignore,warn,error.\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s no apunta a ningún objeto válido!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorando referencia rota %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "no se pudo abrir '%s' para escritura: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "no se pudo leer la referencia '%s'"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "ref '%s' ya existe"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "ID de objecto inesperado cuando se escribía '%s'"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "no se pudo escribir en '%s'"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "no se pudo abrir '%s' para escritura"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID de objecto inesperado cuando se borraba '%s'"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "log de ref %s tiene un vacío tras %s"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "log de ref %s finalizado inesperadamente en %s"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "log de %s está vacío"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "rehusando actualizar ref con mal nombre '%s'"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref falló para ref '%s': %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; no se puede crear '%s'"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
msgid "invalid refspec '%s'"
msgstr "refspec inválido: '%s'"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "desaparecido"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "adelante %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "detrás %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "delante %d, detrás %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento: %s no reconocido %%(%s)"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no toma ningún argumento"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "%%(objectsize) no reconocido argumento: %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no toma argumentos"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no toma ningún argumento"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "%%(trailers) desconocidos, argumento: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %s no reconocido %%(contents)"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positivo esperado objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argumento: %s no reconocido %%(objectname)"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento: %s no reconocido %%(if)"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre mal formado de campo: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
-msgstr "formato: átomo %%(then) usado mas de una vez"
+msgstr "formato: átomo %%(then) usado más de una vez"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) usado después de %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
-msgstr "formato: átomo %%(else) usado mas de una vez"
+msgstr "formato: átomo %%(else) usado más de una vez"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(no hay rama, rebasando %s)"
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
-
-#: ref-filter.c:1459
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(no hay rama, comenzando biseccón en %s)"
+msgid "no branch, rebasing %s"
+msgstr "no hay rama, rebasando %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
+#: ref-filter.c:1488
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD desacoplado en %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD desacoplado de %s)"
+msgid "no branch, bisect started on %s"
+msgstr "no hay rama, comenzando biseccón en %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(sin rama)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "sin rama"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "opción `%s' es incompatible con --merged"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "opción `%s' es incompatible con --no-merged"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
msgid "Recorded preimage for '%s'"
msgstr "Resolución precargada para '%s'"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
msgid "unable to open rr-cache directory"
msgstr "no es posible abrir directorio rr-cache"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent es incompatible con --bisect"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no se pudo eliminar'%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revertir"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"con 'git add <rutas>' o 'git rm <rutas>'\n"
"y haz un commit del resultado con 'git commit'"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "no se pudo leer '%s'"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup inválido %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de la caché"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote para '%s'"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "formato de fecha inválido '%s' en '%s'"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "escribiendo commit raíz"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no es un commit!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "no se puede obtener el mensaje de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta los argumentos: '%s'"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para para %s"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "no se puede leer '%s'."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando cherry-pick en progreso"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "cancelando revert en progreso"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un cherry-pick o revert ya está en progreso"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "revert ya está en progreso"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "cherry-pick ya está en progreso"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
+msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!"
+
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "no hay revert en progreso"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "ningún cherry-pick en progreso"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "falló al escribir el commit"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "no hay nada que saltar"
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"¿ya has hecho el commit?\n"
+"intenta \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "no se puede actualizar %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
msgstr ""
-"Puede enmendar el commit ahora, con\n"
+"Puedes enmendar el commit ahora, con\n"
"\n"
"\tgit commit --amend %s\n"
"\n"
-"Una vez que esté satisfecho con los cambios, ejecute\n"
+"Una vez que estés satisfecho con los cambios, ejecuta\n"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "no se pudo leer índice"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "falló al encontrar árbol de %s"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "no se pudo escribir índice"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no se pudo intentar fusionar '%.*s'"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
"momento.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s no es OID válido"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no se puede desacoplar HEAD"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "no se puede leer orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "no se puede leer 'onto'"
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se puede actualizar HEAD a %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se puede eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: error preparando revisiones"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git "
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
"rebase --continue'.\n"
"O se puede abortar el rebase con 'git rebase --abort'.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap falló"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "archivo de objeto %s está vacío"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto perdido corrupto '%s'"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "basura al final del objeto perdido '%s'"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "tipo de objeto inválido"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "no es posible desempacar header %s con --allow-unknown-type"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "incapaz de desempaquetar header %s"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "no es posible analizar header %s con --allow-unknown-type"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "incapaz de analizar header %s"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "falló al leer objeto %s"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "reemplazo %s no encontrado para %s"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto perdido %s (guardado en %s) está corrompido"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paquete de objeto %s (guardado en %s) está corrompido"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "no es posible escribir archivo %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "falló de escritura"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "error cerrando el archivo de objeto suelto"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"permisos insuficientes para agregar un objeto a la base de datos del "
"repositorio %s"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "no es posible crear un archivo temporal"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "no es posible escribir el archivo de objeto suelto"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd en objeto %s falló (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "confundido por fuente de data de objetos inestable para %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "no se pudo leer el objeto para %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "commit corrupto"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "tag corrupto"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "error leyendo al indexar %s"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "lectura corta al indexar %s"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falló al insertar en la base de datos"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo de archivo no soportado"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s no es objeto válido"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash no concuerda para %s (se esperaba %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "no es posible hacer mmap a %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz de desempaquetar header de %s"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz de analizar header de %s"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
"tal vez sean creadas por error. Por ejemplo,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
"favor\n"
-"examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
+"examina estas refs y tal vez bórralas. Silencia este mensaje \n"
"ejecutando \"git config advice.objectNameWarning false\""
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bytes/s"
+msgstr[1] "%u bytes/s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Falló al resolver HEAD como un ref valido."
+msgstr "Falló al resolver HEAD como un ref válido."
#: submodule.c:1481
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' no pudo ser actualizado."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
"soportado"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "no pudo recursar en el submódulo '%s'"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "operación no soportada por protocolo"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "línea inválida mientras se analizaban refs alternas: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "escritura total al helper remoto falló"
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"No hay refs comunes y ninguno especificado; no se hace nada.\n"
"Tal vez deberías especificar un branch como 'master'.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "leer(%s) falló"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "escribir(%s) falló"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "no se puede iniciar el hilo para copiar data: %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
msgid "empty filename in tree entry"
msgstr "nombre de archivo vacío en la entrada de árbol"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "archivo de árbol muy corto"
msgstr "Abortando\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Revisando archivos"
+msgid "Updating files"
+msgstr "Actualizando archivos"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "segmento de ruta '..' inválido"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
"trabajo"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' no es un archivo .git, código de error %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' no apunta de vuelta a '%s'"
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Rutas no fusionadas:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --staged <archivo>...\" para sacar del área de stage)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área "
+"de stage)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (usa \"git add <archivo>...\" para marcar una resolución)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
"resolución)"
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (usa \"git rm <file>...\" para marcar la resolución)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Cambios a ser confirmados:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Cambios no rastreados para el commit:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
"commit)"
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (usa \"git
checkout -- <archivo>...\" para descartar los cambios en el "
+" (usa \"git
restore <archivo>...\" para descartar los cambios en el "
"directorio de trabajo)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (confirmar o descartar el contenido sin seguimiento o modificado en los "
"sub-módulos)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "ambos borrados:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "agregado por nosotros:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "borrados por ellos:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "agregado por ellos:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "borrado por nosotros:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "ambos agregados:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "ambos modificados:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "nuevo archivo:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "copiado:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "borrado:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "modificado:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "renombrado:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "cambio de tipo:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "desconocido:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "des-fusionado:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "nuevos commits, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "contenido modificado, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contenido no rastreado, "
-#: wt-status.c:896
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Tu stash actualmente tiene %d entrada"
msgstr[1] "Tu stash actualmente tiene %d entradas"
-#: wt-status.c:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
-msgstr "Submodulos cambiados pero no actualizados:"
+msgstr "Submódulos cambiados pero no actualizados:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
-msgstr "Submodulos cambiados listos para realizar commit:"
+msgstr "Submódulos cambiados listos para realizar commit:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"No modifique o borre la línea de encima.\n"
"Todo lo que este por abajo será eliminado."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
+"Puedes usar '--no-ahead-behind' para evitar esto.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Tienes rutas no fusionadas."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregla los conflictos y corre \"git commit\""
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (usa \"git merge --abort\" para abortar la fusion)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Todos los conflictos resueltos pero sigues fusionando."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" para concluir la fusión)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Estás en medio de una sesión am."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "El parche actual está vacío."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregla los conflictos y luego corre \"git am --continue\""
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (usa \"git am --skip\" para saltar este parche)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo no está presente."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "No se realizaron los comandos."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "El último comando realizado (%d comando realizado):"
msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
-#: wt-status.c:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
-msgstr " (ver mas en el archivo %s)"
+msgstr " (ver más en el archivo %s)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
-msgstr "No quedan mas comandos."
+msgstr "No quedan más comandos."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Siguiente comando a realizar (%d comando restante):"
msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Estás aplicando un rebase."
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" para omitir este parche)"
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Estás dividiendo un commit durante un rebase."
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
"continue\")"
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Estás editando un commit durante un rebase."
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
"cambios)"
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
-msgstr "Cherry-pick en progreso actualmente"
+msgstr "Cherry-pick en progreso actualmente."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Estás realizando un cherry-picking en el commit %s."
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
-msgstr "Revierte el estado en progreso actual"
+msgstr "Revierte el estado en progreso actual."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (ejecuta \"git revert --continue\" para continuar)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" para volver a la rama original)"
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD desacoplada en "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD desacoplada de "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
-"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
-"nuevos archivos usted mismo (vea 'git help status')."
+"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
+"nuevos archivos tú mismo (vea 'git help status')."
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
-#: wt-status.c:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
"presentes\n"
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
"hacerles seguimiento)\n"
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "diferente"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "detrás "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "falló la actualización de carpetas"
msgstr ""
"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "dry run ( ejecución en seco)"
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
"Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
"Clones del repositorio exterior no tendrán el contenido del \n"
"repositorio embebido y no sabrán como obtenerla.\n"
-"Si quería agregar un submódulo, use:\n"
+"Si querías agregar un submódulo, usa:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
-"Si se agrego esta ruta por error, puede eliminar desde el índice \n"
+"Si se agrego esta ruta por error, puedes eliminar desde el índice \n"
"usando:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Vea \"git help submodule\" para mas información."
+"Vea \"git help submodule\" para más información."
#: builtin/add.c:354
#, c-format
#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
-msgstr "Use -f si realmente quiere agregarlos.\n"
+msgstr "Usa -f si realmente quieres agregarlos.\n"
#: builtin/add.c:379
msgid "adding files failed"
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
msgid "Failed to split patches."
msgstr "Falló al dividir parches."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "no es posible escribir en el archivo índice"
#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
+msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
#: builtin/am.c:1099
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Repositorio carece de los blobs necesarios para retroceder en una fusión de "
"3-vías."
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Usando la información del índice para reconstruir un árbol base..."
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Editaste el parche a mano?\n"
"No aplica a blobs guardados en su índice."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Falló al fusionar en los cambios."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "aplicando a un historial vacío"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- parche ya aplicado."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-"Todavía tiene rutas sin fusionar en su índice.\n"
-"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
+"Todavía tienes rutas sin fusionar en tu índice.\n"
+"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
"como tal.\n"
-"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
-"él."
+"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
+"en él."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3-vías si es necesario"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "formatear el parche(s)"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "restaurar la rama original y abortar la operación de parchado."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "abortar la operación de parchado pero mantener HEAD donde está."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "muestra el parche siendo aplicado."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "Commits con firma GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
"será removida. Por favor no la use más."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Directorio extraviado %s encontrado.\n"
"Use \"git am --abort\" para borrarlo."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "modo interactivo requiere parches en la línea de comando"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opciones>] [<parche>...]"
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Tiene que dar al menos un %s y un %s revision.\n"
-"Puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
+"Tienes que dar al menos un %s y un %s revision.\n"
+"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
#: builtin/bisect--helper.c:289
#, c-format
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-"Tiene que comenzar por \"git bisect start\".\n"
-"Después tiene que entregar al menos un %s y una revision %s.\n"
-"Puede usar \"git bisect %s\" y \"git bisect %s\" para eso."
+"Tienes que comenzar por \"git bisect start\".\n"
+"Después tienes que entregar al menos un %s y una revision %s.\n"
+"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
#: builtin/bisect--helper.c:321
#, c-format
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-"Error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
#: builtin/bisect--helper.c:547
msgid "won't bisect on cg-seek'ed tree"
msgid "bad HEAD - strange symbolic ref"
msgstr "mal HEAD - ref simbólico extraño"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "ref inválido: '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "realiza 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escribe los términos a .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "limpiar el estado de bisección"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "revisar por revs esperados"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "reiniciar el estado de bisect"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "escribir el estado de bisect en BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "revisar y configurar los terms en el estado de bisect"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "revisar si existen términos malos o buenos"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "imprimir los terms del bisect"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "comenzar la sesión de bisect"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "no hay log para BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms requiere dos argumentos"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no requiere argumentos"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset requiere un commit o ningún argumento"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write requiere entre 4 o 5 argumentos"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--bisect-clean-state no requiere argumentos"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check requiere 2 o 3 argumentos"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requiere 0 o 1 argumentos"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> están documentadas en git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "esperando un color: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "tiene que terminar con un color"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color inválido '%s' en color.blame.repeatedLines"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valor inválido para blame.coloring"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "no se pudo encontrar revision %s para ignorar"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "No tratar commits raíces como extremos (Default: off)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Mostrar estadísticas de costo de trabajo"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Forzar el reporte de progreso"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Mostrar la puntuación de salida de las entradas de blame"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Mostrar nombre original del archivo (Default: auto)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar número de línea original (Default: off)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Mostrar en un formato diseñado para consumo de máquina"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Mostrar en formato porcelana con información de commit por línea"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar timestamp en formato raw (Default: off)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Suprimir nombre del autor y timestamp (Default: off)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Mostrar en cambio el email del autor (Default: off)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignorar <rev> durante el blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorar revisiones de <archivo>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
-msgstr "colorear metadata redundante de lineas previas de manera diferente"
+msgstr "colorear metadata redundante de líneas previas de manera diferente"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
-msgstr "colorear lineas por edad"
+msgstr "colorear líneas por edad"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usar un heurístico experimental para mejorar los diffs"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Ocupo más ciclos para encontrar mejoras resultados"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usar contenido de <archivo> como imagen final"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "puntaje"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Encontrar copias de líneas entre y a través de archivos"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Encontrar movimientos de líneas entre y a través de archivos"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "archivo %s tiene solo %lu línea"
msgstr[1] "archivo %s tiene solo %lu líneas"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Blaming a líneas"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opciones>] [-r | -a] [--formato]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"borrando la rama '%s' que ha sido fusionada en\n"
" '%s', pero aún no ha sido fusionada a HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"no borrando rama '%s' que todavía no ha sido fusionada \n"
"\ta '%s', aunque se fusione con HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "No se pudo encontrar el objeto commit para '%s'"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, 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 ""
"La rama '%s' no ha sido fusionada completamente.\n"
-"Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
+"Si estás seguro de querer borrarla, ejecuta 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Falló de actualización de config-file"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "no se puede usar-a con -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "No se pudo revisar el objeto commit para HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "rama de rastreo remoto '%s' no encontrada."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "rama '%s' no encontrada."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Error al eliminar la rama de rastreo remota '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Error al eliminar la rama '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s)..\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no es posible analizar el string de formato"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "no se pudo resolver HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fuera de refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama inválido: '%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Copiado de rama fallido"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Copia creada de la rama malnombrada '%s'"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La rama está renombrada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La rama está copiada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
"%s\n"
"Las líneas que comiencen con '%c' serán removidas.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opciones genéricas"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "suprimir mensajes informativos"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Desconfigurando la info de upstream"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de traqueo remoto"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contienen el commit"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contienen el commit"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "borrar rama (incluso si no está fusionada)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copiar una rama y su reflog"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copiar una rama, incluso si el objetivo existe"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "muestra el nombre de branch actual"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea el reflog de la rama"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "edita la descripción de la rama"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "fuerza la creación,movimiento/renombrado,borrado"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "muestra solo ramas que han sido fusionadas"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "muestra solo ramas que no han sido fusionadas"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "muestra las ramas en columnas"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "imprimir sólo las ramas del objeto"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filtrado son case-insensitive"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no encontrado abajo de refs/heads!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "no se puede editar la descripción de más de una rama"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay commits en la rama '%s'."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de copiado"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombrado"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene información de upstream"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
+"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n"
+"¿Quisiste usar: -a|-r --list <patrón>?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "solo se puede especificar una opción batch"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "use una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "mostrar info y content de los objetos alimentados por standard input"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "no ordenar el output de --batch-all-objects"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
msgstr "escribir el contenido en un archivo temporal"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "string"
msgid "copy out the files from named stage"
msgstr "copiar los archivos del stage nombrado"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opciones>] <rama>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opciones>] [<rama>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "ruta '%s' no tiene nuestra versión"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "ruta '%s' no tiene su versión"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "ruta '%s' no tiene todas las versiones necesarias"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ruta '%s' no tiene versiones necesarias"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "ruta '%s': no se puede fusionar"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Incapaz de agregar resultados de fusión a '%s'"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Recreado %d conflicto de merge"
+msgstr[1] "Recreados %d conflictos de merge"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Actualizada %d ruta para %s"
+msgstr[1] "Actualizadas %d rutas para %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Actualizada %d ruta desde el index"
+msgstr[1] "Actualizadas %d rutas desde el index"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no puede ser usada con rutas actualizadas"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no puede ser usado con %s"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "ruta '%s' no esta fusionada"
+msgid "neither '%s' or '%s' is specified"
+msgstr "ni '%s' o '%s' están especificados"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Recreado %d conflicto de merge"
-msgstr[1] "Recreados %d conflictos de merge"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "Actualizada %d ruta para %s"
-msgstr[1] "Actualizadas %d rutas para %s"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' o '%s' no puede ser usado con %s"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "Actualizada %d ruta desde el index"
-msgstr[1] "Actualizadas %d rutas desde el index"
+msgid "path '%s' is unmerged"
+msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
-msgstr "necesita resolver su índice actual primero"
+msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
"cambios en el área de stage en el siguiente archivo pueden ser perdidos: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
msgstr[0] ""
-"Peligro: está saliendo %d commit atrás, no está conectado\n"
+"Peligro: estás saliendo %d commit atrás, no está conectado\n"
"a ninguna rama:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Peligro: está saliendo %d commits atrás, no está conectado\n"
+"Peligro: estás saliendo %d commits atrás, no está conectado\n"
"a ninguna rama:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"Si quiere conservarlo creando una nueva rama, este es un buen momento\n"
+"Si quieres conservarlo creando una nueva rama, este es un buen momento\n"
"para hacerlo:\n"
"\n"
" git branch <nuevo-nombre-de-rama> %s\n"
"\n"
msgstr[1] ""
-"Si quiere conservarlos creando una nueva rama, este es un buen momento\n"
+"Si quieres conservarlos creando una nueva rama, este es un buen momento\n"
"para hacerlo:\n"
"\n"
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "error interno en camino de revisión"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "solo una referencia esperada"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n árbol: %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "se esperaba un branch, se obtuvo tag '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "se espera una rama, se obtuvo una rama remota '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "se esperaba branch, se obuto '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "se espera una rama, se obtuvo commit '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un merge\n"
+"Considera \"git merge --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch en medio de una sesión de am\n"
+"Considera \"git am --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un rebase\n"
+"Considera \"git rebase --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un cherry-pick\n"
+"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"no se puede cambiar de branch durante un revert\n"
+"Considera \"git revert --quit\" o \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "estás cambiando ramas durante un bisect"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' no puede tomar <punto de partida>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "rama"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "crear y hacer checkout a una nueva rama"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "forzar el reporte de progreso"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "crear/reiniciar y hacer checkout a una rama"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "realizar una fusión de tres vías con la rama nueva"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "crear un reflog para una nueva rama"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "estilo"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "conflicto de estilos (merge o diff3)"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "forzar el checkout (descartar modificaciones locales)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "actualizar archivos ignorados (default)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
+
+#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "forzar el checkout (descartar modificaciones locales)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "realizar una fusión de tres vías con la rama nueva"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "actualizar archivos ignorados (default)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "estilo"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "conflicto de estilos (merge o diff3)"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a dispersar entradas solamente"
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "no adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forzar el reporte de progreso"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "usar modo overlay (default)"
-
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "falta nombre de rama; prueba -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "no se pudo resolver %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "debes especificar path(s) para restaurar"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"de nombre <nombre> remota, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "rama"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crear y hacer checkout a una nueva rama"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crear/reiniciar y hacer checkout a una rama"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crear un reflog para una nueva rama"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "usar modo overlay (default)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "crear y hacer switch a una nueva rama"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "crear/reiniciar y hacer switch a una rama"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "descartar modificaciones locales"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "de qué árbol hacer el checkout"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "restaurar el index"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "restaurar el árbol de trabajo (default)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorar entradas no fusionadas"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "usar modo overlay"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "falló al borrar %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "no se pudo lstat %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - selecciona un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - escoger todos los objetos\n"
" - (vacío) terminar selección\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Ahh (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Input ignora los patrones >> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Seleccionar objetos para borrar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Borrar %s [y/N]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - esta ventana\n"
"? - ayuda para selección de opciones"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Ahora que"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Se eliminará el siguiente objeto:"
msgstr[1] "Se eliminarán los siguientes objetos:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
-msgstr "No hay mas archivos para limpiar, saliendo."
+msgstr "No hay más archivos para limpiar, saliendo."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "no imprimir nombres de archivos borrados"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "forzar"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "limpieza interactiva"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "borrar directorios completos"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "agregar <patrón> para ignorar reglas"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "borrar archivos ignorados, también"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x y -X no pueden ser usadas juntas"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "no crear checkout"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crear un repositorio vacío"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crear un repositorio espejo (implica vacío)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "clonar de un repositorio local"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "no usar hardlinks, siempre copiar"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "nombre"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profundidad"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "tiempo"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "llave=valor"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "especifico-de-servidor"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "opción para trasmitir"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "falló al abrir '%s'"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "falló al analizar %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "falló al iterar sobre '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Clonado exitoso, pero falló el checkout.\n"
-"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
-"y volver a intentarlo con 'git checkout -f HEAD'\n"
+"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
+"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
msgid "duplicate parent %s ignored"
msgstr "padre duplicado %s ignorado"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "no es un nombre de objeto válido %s"
msgid "id of a parent commit object"
msgstr "id del objeto commit padre"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "mensaje"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "mensaje del commit"
msgid "read commit log message from file"
msgstr "leer mensaje de commit desde un archivo"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Firmar commit con GPG"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n"
+"Has solicitado un amend en tu commit más reciente, pero hacerlo lo \n"
"vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n"
"el commit completamente con \"git reset HEAD^\".\n"
msgstr ""
"El cherry-pick anterior ahora está vacío, posiblemente por un conflicto de "
"resolución.\n"
-"Si desea realizar un commit de todas maneras, use:\n"
+"Si deseas realizar un commit de todas maneras, usa:\n"
"\n"
" git commit --allow-empty\n"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Caso contrario, por favor usa 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Si quiere saltar este commit, use:\n"
+"y luego usa:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"para resumir el cherry-pick con los commits faltantes.\n"
+"Si deseas saltar el commit, usa:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
-"para los commits restantes.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "falló al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el cache principal del árbol"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "no es posible escribir archivo new_index"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusión."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "no se puede realizar un commit parcial durante un cherry-pick."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "no se puede leer el índice"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una línea de autor mal formada"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"no es posible seleccionar un carácter de comentario que no es usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"y vuelve a intentar.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
"\n"
-"Parece que puede estar haciendo un commit a un cherry-pick.\n"
-"Si esto no es correcto, por favor elimine el archivo\n"
+"Parece que puedes estar haciendo un commit a un cherry-pick.\n"
+"Si esto no es correcto, por favor elimina el archivo\n"
"\t%s\n"
-"y vuelva a intentar.\n"
+"y vuelve a intentar.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, 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 ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que "
"comiencen\n"
"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que "
"comiencen\n"
"con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
"autor existente"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo ignorado inválido '%s'"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de los archivos no rastreados '%s'"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Estás en medio de una fusión -- no puedes enmendar."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "La opción -m no puede ser combinada con -c/-C/-F."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "No hay rutas con --include/--only no tiene sentido."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "output formato-maquina"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
"(Predeterminado: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
"(Default: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinación de argumentos de archivos ignorados y no rastreados no soportada"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "suprime summary tras un commit exitoso"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "sobrescribe el autor del commit"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "sobrescribe la fecha del commit"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit especifico"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit especifico"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensaje de formato autosquash para arreglar el commit especificado"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar el mensaje de formato autosquash para realizar squash al commit "
"especificado"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "agregar Signed-off-by: (firmado por)"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "sólo confirmar archivos específicos"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "gancho bypass post reescritura"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok al grabar un cambio vacío"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok al grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando commit debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; no se ha editado el mensaje\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
"new_index. Verifique que el disco no este lleno y la quota no ha\n"
-"sido superada, y luego \"git reset HEAD\" para recuperar."
+"sido superada, y luego \"git restore --sateged :/\" para recuperar."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append][--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "dir"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "El directorio de objetos para guardar el gráfico"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "si el commit-graph está cortado, solo verifica la punta del archivo"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No se pudo abrir commit-graph '%s'"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "comenzar caminata en todas las refs"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "escanear paquete de índices por stdin por commits"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "comenzar a caminar a los commits listados por stdin"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "inclye todos los commits que ya están en el archivo commit-graph"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir escribir un archivo commit-graph incremental"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "máximo número de commits en un commit-graph sin base cortada"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "radio máximo entre dos niveles de corte de commit-graph"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<opciones>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argumento --type no reconocido, %s"
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "al valor se ha dado este tipo"
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valor"
msgid "do not consider tags matching <pattern>"
msgstr "no considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "mostrar el objeto commit abreviado como fallback"
#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
-msgstr "tal vez desee limpiar o recuperar estos."
+msgstr "tal vez desees limpiar o recuperar estos."
#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipo"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "default para git_env_*(...) es hacer fallback en"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "ser silencioso solo usar valor git_env_*() como código de salida"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Volcar marcas a este archivo"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importar marcas de este archivo"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Use el feature done para terminar el stream"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Saltar el output de data blob"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Padres de la referencia que no estan en fast-export stream por id de objeto"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Mostrar ids de objetos originales para blobs/commits"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opciones>] <grupo>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opciones>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "extraer de todos los remotos"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "ruta para cargar el paquete al final del remoto"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "forzar sobrescritura de referencia local"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "extraer de múltiples remotos"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "extraer todos los tags y objetos asociados"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "no extraer todos los tags (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos extraídos en paralelo"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"limpiar tags locales que no se encuentran en el remoto y eliminar tags "
"cambiados"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "en demanda"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controlar extracción recursiva de submódulos"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "mantener el paquete descargado"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permitir actualizar la ref HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "historia profunda de un clon superficial"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "historia profunda de un repositorio superficial basado en tiempo"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "convertir a un repositorio completo"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteponer esto a salida de la ruta del submódulo"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"default para extracción recursiva de submódulos (menor prioridad que "
"archivos de configuración)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "aceptar refs que actualicen .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "especificar extracción de refmap"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "ejecutar 'gc --auto' tras el fetch"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "verificar updates forzados en todos los branch actualizados"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "No se puedo encontrar ref remota HEAD"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "no se posible actualizar el ref local"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "podría golpear tag existente"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "avance lento"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Fetch normalmente incida qué branches han tenido un update forzado,\n"
+"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--"
+"show-forced-updates'\n"
+"o ejecute 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Tomó %.2f segundos validar los updates forzados. Puedes usar\n"
+"'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates "
+"false'\n"
+"para evitar esta validación.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
" 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se pondrá colgado)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha colgado)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter solo puede ser usado con el remoto configurado en extensions."
"partialClone"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
-msgstr "Tiene que especificar un nombre de tag."
+msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "mostrar solo <n> refs encontradas"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respetar el formato de colores"
msgid "Checking %s link"
msgstr "Revisando link %s"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verboso para objetos alcanzables"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Revisando objetos"
msgid "cannot stat '%s'"
msgstr "no se pudo definir '%s'"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
"es así)"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "encontrar en contenidos no manejados por git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados via '.gitignore'"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerdan"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings arreglados"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primer coincidencia"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "mostrar solo partes que concuerdan de una línea"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
"archivo"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr ""
"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "mostrar árbol analizado para la expresión grep"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "no se ha entregado patrón"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no se posible resolver revisión: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opción no soportada con --recurse-submodules"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached y árboles han sido entregados"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "tipo"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipo de objeto"
msgid "no info viewer handled the request"
msgstr "ningún visor de info manejo la petición"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mal alias.%s string: %s"
msgid "'git help config' for more information"
msgstr "'git help config' para más información"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "leer error en input"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la definición actual de off_t"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no se puede abrir el archivo de paquete '%s'"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "inflate devolvió %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "no se puede propagar el paquete"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "error de fsck en el objeto empaquetado"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tail checksum para %s inesperada (corrupción de disco?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir %s en el archivo '%s'"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar escrito %s en archivo '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "error mientras se cierra el archivo paquete"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "no se puede guardar el archivo paquete"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el índice del archivo paquete para '%s'"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
msgstr ""
"especifica que el repositorio de git será compartido entre varios usuarios"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "no se pude crear directorio %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "no se puede aplicar chdir a %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
"dir=<directorio>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No se puede acceder al árbol de trabajo '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<valor>])...] [<archivo>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "editar archivos en el lugar"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "cortar trailers vacíos"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "donde colocar el nuevo trailer"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "acción if trailer ya existe"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "acción si falta el trailer"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "mostrar solo los trailers"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "no aplicar reglas de configuración"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "juntar valores con espacios en blanco contiguos"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "configurar opciones de análisis"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "no tratar --- especialmente"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "trailer"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "trailer(s) para agregar"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer con --only-input no tiene sentido"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "no se entregó archivo de entrada para edición en lugar"
msgid "git show [<options>] <object>..."
msgstr "git show [<opciones>] <objeto>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opción --decorate inválida: %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "mostrar fuente"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Usar archivo de mapa de mail"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "solo decorar refs que concuerden con <patrón>"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "no decorar refs que concuerden con <patrón>"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "opciones de decorado"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Salida final: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: mal archivo"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "no se pudo leer objeto %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "tipo desconocido: %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "formate.headers. sin valor"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "nombre del directorio de salida es muy largo"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "no se puede abrir archivo patch %s"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "necesita exactamente un rango"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "no es un rango"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "letras de portada necesita formato email"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "falló al crear los archivos cover-letter"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "insano in-reply-to: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "dos directorios de salida?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "commit desconocido %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "falló al resolver '%s' como ref válida"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "no se pudo encontrar una base de fusión exacta"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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 ""
-"falló al conseguir upstream, si quiere grabar un commit base de manera "
+"falló al conseguir upstream, si quieres grabar un commit base de manera "
"automática,\n"
-"por favor use git branch --set-upstream-to para rastrear una rama remota.\n"
-"O puede especificar un commit base mediante --base=<id-commit-base> "
+"por favor usa git branch --set-upstream-to para rastrear una rama remota.\n"
+"O puedes especificar un commit base mediante --base=<id-commit-base> "
"manualmente"
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "falló al encontrar una base de fusión exacta"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "el commit base debe ser el ancestro de la lista de revisión"
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "el commit base no debe estar en la lista de revisión"
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "no se puede obtener id de patch"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "falló al inferir rangos range-diff"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "use [PATCH n/m] incluso con un único parche"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "use [PATCH] incluso con múltiples parches"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "mostrar parches en standard out"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "generar letra de cover"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr ""
"usar una secuencia simple de números para salida de nombres de archivos"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "use <sfx> en lugar de '.patch'"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "marcar las series como Nth re-roll"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Use [RFC PATCH] en lugar de [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Use [<prefijo>] en lugar de [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "guardar archivos resultantes en <dir>"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "no cortar/agregar [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "no mostrar diffs binarios"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "salida como hash de todos-ceros en la cabecera From"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "no incluya un parche que coincida con un commit en upstream"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "mostrar formato de parche en lugar del default (parche + stat)"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Mensajeando"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "cabezal"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "agregar cabecera email"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "email"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "agregar cabecera To:"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "agregar cabecera Cc:"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"configurar dirección From a <ident> ( o identidad de committer si está "
"ausente)"
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "id de mensaje"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "hacer primer mail una respuesta a <id de mensaje>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "límite"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "adjuntar el parche"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "poner el parche en línea"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "agregar una firma"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr ""
"agregar información de árbol de requisitos previos a la serie de parches"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "agregar una firma de un archivo"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "no mostrar los nombres de archivos de los parches"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "mostrar medidor de progreso mientras se generan los parches"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "porcentaje por el cual la creación es pesada"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "línea de identificación inválida: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n y -k son mutuamente exclusivas"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only no tiene sentido"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status no tiene sentido"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check no tiene sentido"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "salida standard, o directorio, cual?"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiere --cover-letter o un parche único"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiere --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiere --cover-letter o parche único"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff contra v%d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no se puede leer la firma del archivo '%s'"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Generando parches"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "falló al crear los archivos de salida"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "no mostrar el URL remoto"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "ejecutar"
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "cambiar `m' requiere un valor"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "opción `%s' requiere un valor"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "no mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
"fusión"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crear un commit único en lugar de hacer una fusión"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "permitir fast-forwars (default)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "verificar que el commit nombrado tiene una firma GPG válida"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort pero deja el índice y el árbol de trabajo solos"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verificar el hook commit-msg"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (nada para hacer squash)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no apunta a ningún commit"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opción desconocida para merge-recursive: -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribir %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "No se puedo leer de '%s'"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"No se realiza commit de la fusión; use 'git commit' para completar la "
"fusión.\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"tópico.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Un mensaje vacío aborta el commit.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
" el commit.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Fusión automática falló; arregle los conflictos y luego realice un commit "
"con el resultado.\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Por defecto, no hay un upstream definido para la rama actual."
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "No hay rama de rastreo remoto para %s de %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor erróneo '%s' en el entorno '%s'"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit no espera argumentos"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"No ha concluido la fusión (existe MERGE_HEAD).\n"
-"Por favor, realice un commit con los cambios antes de fusionar."
+"No has concluido la fusión (existe MERGE_HEAD).\n"
+"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
-"Por favor, realice un commit con los cambios antes de fusionar."
+"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
+"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
+msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "No se puede combinar --squash con --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Ya está actualizado."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nop.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "No es posible hacer fast-forward, abortando."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Usando el %s para preparar resolución a mano.\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr "permitir la creación de más de un árbol"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<tamaño>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"durante el repack, recolectar los pack-files de tamaño menor en un batch que "
+"es más grande que este tamaño"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "muchos argumentos"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "opción --batch-size es solo para el subcomando 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verbo no reconocido: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconocido: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrando '%s' falló"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opciones>] <commit>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opciones>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opciones>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "imprimir sólo nombres (sin SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "sólo usar tags para nombrar commits"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "solo usar refs que concuerden con <patrón>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorar refs que concuerden con <patrón>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "listar todos los commits alcanzables desde todas las referencias"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "leer desde stdin"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "permitir imprimir nombres `undefined` (predeterminado)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "desreferenciar tags en la entrada (uso interno)"
msgid "the note contents have been left in %s"
msgstr "los contenidos de nota han sido dejados en %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
"de-objetos>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mal paquete de objeto CRC para %s"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "objeto empaquetado corrupto para %s"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo encontrado para objeto %s"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objetos ordenados, esperados %<PRIu32>"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "packfile es inválido: %s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "no es posible abrir packfile para reusar: %s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "no es posible buscar en los packfile reusados"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "no es posible leer de packfile reusado"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
"empaquetados"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow de offset en la base de delta en paquete para %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "outbound de offset en la base de delta para %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "no se pudo obtener el tamaño de %s"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"se espseraba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"se esperaba ID de objeto, se obtuvo basuta:\n"
"%s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto perdido en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "incapaz de forzar un objeto perdido"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "escribir un índice de bitmap si es posible"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no puede ser usado para construir un paquete para "
"transferencia"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no puede ser usado para construir un paquete indexable"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar--filter sin --stdout"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "control de fetch recursivo en submódulos"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opciones relacionadas a fusión"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opciones relacionadas a fetch"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "forzar sobrescritura de la rama local"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "número de submódulos que realizan pull en paralelo"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido para pull.ff: %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hay candidatos para fusionar entre las refs que has bajado con fetch."
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"tiene\n"
"concordancia en el final remoto."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en la rama."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Por favor especifica a qué rama quieres rebasar."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Por favor especifica a qué rama quieres fusionar."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Ver git-pull(1) para detalles."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si deseas configurar el rastreo de información para esta rama, puedes "
"hacerlo con:"
-#: builtin/pull.c:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"Tu configuración especifica fusionar con la ref '%s'\n"
"de tu remoto, pero no se pudo hacer fetch a esa ref."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "no es posible acceder al commit %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "La opción --[no-]autostash sólo es válida con --rebase."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nata con cambios agregados al índice."
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
-"Está haciendo un push al remoto '%s', el cual no es el upstream de\n"
-"su rama actual '%s', sin decirme qué poner en el push\n"
+"Estás haciendo un push al remoto '%s', el cual no es el upstream de\n"
+"la rama actual '%s', sin decirme qué poner en el push\n"
"para actualizar en qué rama de remoto."
#: builtin/push.c:269
"Actualizaciones fueron rechazadas porque la punta de tu rama actual está\n"
"detrás de su contraparte remota. Integra los cambios remotos (es decir\n"
"'git pull ...') antes de hacer push de nuevo.\n"
-"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
+"Mira 'Note about fast-forwards' en 'git push --help' para más detalles."
#: builtin/push.c:282
msgid ""
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
+"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n"
"sin usar la opción '--force'.\n"
msgid "keep empty commits"
msgstr "mantener commits vacíos"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permitir commits con mensajes vacíos"
msgid "sign commits"
msgstr "firmar commits"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "mostrar un diffstat de lo que cambió en upstream"
msgid "the command to run"
msgstr "el comando para ejecutar"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "reprogramar automaticamente cualquier `exec` que falle"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requiere un rebase interactivo"
msgid "Cannot store %s"
msgstr "No se puede guardar %s"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "no se pudo determinar revisión HEAD"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"Resuelva todos los conflictos manualmente ya sea con \n"
"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
"\".\n"
-"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n"
-"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
+"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n"
+"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "comandos exec no pueden contener newlines"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "comando exec vacío"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase hacia rama dada en lugar de upstream"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso implica --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "pasado a 'git am'"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "pasado a 'git-apply'"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "aborta y revisa la rama original"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "aborta pero mantiene HEAD donde está"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "muestra el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "permitir al usuario editar la lista de commits para rebasar"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "preservar commits vacíos durante el rebase"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "ejecutar automáticamente stash/stash pop antes y después"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "agregar líneas exec tras cada acommit de la lista editable"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase commits con mensajes vacíos"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "intentar fusiones por rebase en lugar de saltarlas"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "use 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"el soporte para rebase.useBuiltin ha sido removido!\n"
"Vea su entrada en 'git help config' para detalles."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "No hay rebase en progreso?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "no se pudo eliminar'%s'"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"valuable there.\n"
msgstr ""
"Parece que ya hay un directorio %s, y\n"
-"me pregunto si está en medio de otro rebase. Si ese es el \n"
-"caso, por favor intente\n"
+"me pregunto si estás en medio de otro rebase. Si ese es el \n"
+"caso, por favor intenta\n"
"\t%s\n"
"Si no es el caso, por favor\n"
"\t%s\n"
-"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
+"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec requiere --exec o --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"no se pueden combinar opciones de am con opciones interactivas o de merge"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
"exec'"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "no se puede combinar '--rebase-merges' con '--strategy'"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no existe la rama/commit: '%s'"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "No se puede ejecutar autostash"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Respuesta de stash inesperada: '%s'"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "No se pudo crear el directorio para '%s'"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autostash creado: %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "no se pudo reset --hard"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Rama actual %s está actualizada, rebase forzado.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
"de ésta...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rápido de %s a %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"arreglar\n"
"el árbol de trabajo con HEAD.\n"
"\n"
-"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n"
+"Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n"
"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
-"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n"
-"se haya organizado para actualizar su árbol de trabajo para que coincida con "
+"su rama actual; Sin embargo, esto no se recomienda a menos que tú\n"
+"te hayas organizado para actualizar su árbol de trabajo para que coincida con "
"lo que\n"
-"enviará con el push de otra manera.\n"
+"enviarás con el push de otra manera.\n"
"\n"
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
-"configure 'receive.denyCurrentBranch' a 'refuse'."
+"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
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"
"en el repositorio remoto para permitir borrar la rama actual.\n"
"con o sin mensaje de advertencia.\n"
"\n"
-"Para suprimir este mensaje, puede configurarlo en 'refuse'."
+"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
"Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no se puede finalizar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y pierde objetos inaccesibles"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "aproxime"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "con -a, re empaquetar objetos inalcanzables"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usado para la compresión delta"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
"entradas"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "re-empaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Nada nuevo para empaquetar."
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: también falló.\n"
"WARNING: Por favor renombralos en %s manualmente:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "falló al eliminar'%s'"
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "no se puede combinar --exclude-promisor-objects y --missing"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "filtrado de objetos requiere --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valor disperso inválido: '%s'"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list no soporta mostrar notas"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
msgid "cancel revert or cherry-pick sequence"
msgstr "cancelar secuencia revert o cherry-pick"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "saltar el commit actual y continuar"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "no realizar commit de forma automática"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "editar el mensaje de commit"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "número-de-padre"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "seleccionar el padre principal"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "estrategia de fusión"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opción para estrategia de fusión"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "adjuntar el nombre del commit"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "preservar commits iniciales vacíos"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "no hay refs que concuerden con %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "mostrar ramas locales y de rastreo remoto"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "mostrar ramas de rastreo remoto"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "color '*!+-' correspondiendo a la rama"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "mostrar <n> commits más tras encontrar el ancestro común"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinónimo de más=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "suprimir strings de nombre"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "incluir la rama actual"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "nombrar commits con sus nombres de objeto"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "mostrar bases de fusión posibles"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "mostrar refs inalcanzables por ningún otro ref"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "mostrar commits en orden topológico"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "mostrar solo commits que no están en la primera rama"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "mostrar fusiones alcanzables solo por una punta"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog no es compatible con --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "no se dieron ramas, y el HEAD no es válido"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "opción --reflog necesita un nombre de rama"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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] "solo %d entrada puede ser mostrada a la vez."
msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "no existe el ref %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "no se puede manejar más de %d rev."
msgstr[1] "no se puede manejar más de %d revs."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' no es una ref válida."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "No se puede actualizar %s con %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "mensaje de stash"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" requiere un argumento <commit>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes un commit inicial"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
-msgstr "Olvidó 'git add'?"
+msgstr "Olvidaste 'git add'?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Directorio de trabajo guardado y estado de índice %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "No se pueden eliminar cambios del árbol de trabajo"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "mantener index"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "stash en modo patch"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "modo tranquilo"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "incluir archivos sin seguimiento en stash"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "incluir archivos ignorados"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "no se pudo ejecutar %s"
msgid "prepend comment character and space to each line"
msgstr "anteponer carácter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
"run_command devolvió estado no-cero para %s\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"anidados de %s\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Suprime la salida al inicializar cada comando de submódulo"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Recursar en submódulos anidados"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
"su propio upstream autoritativo."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Suprime la salida para inicializar un submódulo"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opciones>] [<path>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falló al recursar en el submódulo '%s'"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Suprimir output del estado del submódulo"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "recursar en submódulos anidados"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url del submódulo para '%s'\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "error al actualizar el remoto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Suprime la salida del url del submódulo que se sincroniza"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
-"rf' si realmente quiere eliminarlo incluyendo todo en su historia)"
+"rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
"'-f' para descartarlas"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directorio '%s' limpiado\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no se pudo crear directorio vacío de submódulo %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-"Remover arboles de trabajo de submódulos incluso si contienen cambios locales"
+"Remover árboles de trabajo de submódulos incluso si contienen cambios locales"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Quitar todos los submódulos"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "forzar el proceso de clonado"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
"<ruta>"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'"
+msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-"Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'"
+"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
-msgstr "Tal vez quiere usar 'update --init'?"
+msgstr "Tal vez quieres usar 'update --init'?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "ruta hacia el árbol de trabajo"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Crea un clon superficial truncado al número especificado de revisión"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "trabajos paralelos"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación superficial"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonado"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-"Rama de submódulo (%s) configurada para heredar rama del superproyecto, "
-"pero el superproyecto no está en ninguna rama"
+"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
+"el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no se pudo conseguir un handle para el submódulo '%s'"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
#: builtin/submodule--helper.c:2159
msgid "unset the config in the .gitmodules file"
-msgstr "desconfigura la opcion en elarchivo .gitmodules"
+msgstr "desconfigura la opción en elarchivo .gitmodules"
#: builtin/submodule--helper.c:2164
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
"por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' no es un comando submodule--helper valido"
+msgstr "'%s' no es un comando submodule--helper válido"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' no encontrado."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' eliminada (era %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"Las líneas que comienzan con '%c' serán ignoradas.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
"ti mismo si quieres hacerlo.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "incapaz de firmar tag"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "incapaz de escribir el archivo de tag"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "¿Sin mensaje de tag?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "El mensaje del tag ha sido dejado en %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de tag"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contienen el commit"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contienen el commit"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "sólo imprimir las tags que están fusionadas"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "sólo imprimir las tags que no están fusionadas"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "sólo imprimir tags de el objeto"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en modo lista"
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "sólo se permite una de las opciones, -m ó -F."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "demasiados parámetros"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de tag válido."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos"
+msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos"
#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrumpir transferencia tras <n> segundos de inactividad"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "imprimir contenido del commit"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "muestra la salida de status gpg en formato raw"
msgid "show statistics only"
msgstr "solo mostrar estadísticas"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "imprimir contenido del tag"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "falló al borrar '%s'"
"'%s' es un árbol de trabajo faltante pero ya registrado;\n"
"usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
"trabajo"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no se pudo descubrir el nombre de destino de '%s'"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "el objetivo '%s' ya existe"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"no se puede mover un árbol de trabajo bloqueado;\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' está sucio, use --force para borrarlo"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"no se pueden eliminar árbol de trabajo bloqueado;\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
"\n"
"\tchmod 0700 %s"
msgstr ""
-"Los permisos en su directorio de socket son demasiado flojos; otros\n"
-"usuarios pueden leer sus credenciales almacenadas en caché. Considere "
+"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
"ejecutar:\n"
"\n"
"\tchmod 0700 %s"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
-"para leer sobre un subcomando o concepto específico."
+"para leer sobre un subcomando o concepto específico.\n"
+"Mira 'git help git' para una vista general del sistema."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no se entregó directorio para --git-dir\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no se entregó namespace para --namespace\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no se entregó directorio para --work-tree\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "no se entregó prefijo para --super-prefix\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera un string de configuración\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "no se entregó directorio para -C\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "opción %s desconocida\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "al expandir el alias '%s':'%s'"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"alias '%s' cambia las variables de entorno.\n"
"Puedes usar '!git' en el alias para hacer esto"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "alias vacío para %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursivo: %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "error de escritura en standard output"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "error desconocido de escritura en standard output"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "cierre falló en standard output"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "no se puede manejar %s como un builtin"
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "falló al ejecutar comando '%s': %s\n"
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
-msgstr "ser mas verboso"
+msgstr "ser más verboso"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
-msgstr "ser mas discreto"
+msgstr "ser más discreto"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> dígitos para mostrar SHA-1s"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"
"actualizar el índice con la resolución de conflictos reutilizada si es "
"posible"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Agrega contenido de carpetas al índice"
#: command-list.h:121
msgid "Join two or more development histories together"
-msgstr "Junta dos o mas historiales de desarrollo juntos"
+msgstr "Junta dos o más historiales de desarrollo juntos"
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
msgstr "Reinicia el HEAD actual a un estado especifico"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Restaurar archivos de árboles de trabajo"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Revierte algunos commits existentes"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronológico inverso"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Seleccionar y masajear los parámetros"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Borra archivos del árbol de trabajo y del índice"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Envía una colección de parches como e-mails"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Empujar objetos por protocolo Git a otro repositorio"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Resumir la salida 'git log'"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Muestra varios tipos de objetos"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Mostrar ramas y sus commits"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Mostrar el índice de archivo empaquetado"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Listar referencias en el repositorio local"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "El código de configuración i18n de Git para scripts de shell"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Código de configuración de script de shell común de Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr ""
"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
"maneras"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Agrega contenidos de un archivo al área de staging"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Muestra el estado del árbol de trabajo"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Eliminar el espacio en blanco innecesario"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Inicializa, actualiza o inspecciona submódulos"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operación bidireccional entre un repositorio Subversion y Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Cambiar branches"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Lee, modifica y borra referencias simbólicas"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Crea un archivo temporal con contenidos de un blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objetos de un archivo empaquetado"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Actualiza el archivo de información auxiliar para ayudar a los servidores "
"dumb"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Enviar archivo a git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Enviar objetos empaquetados a git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Mostrar una variable lógica de Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Verificar firma GPG de commits"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valida archivos Git empaquetados"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG de etiquetas"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Muestra logs con las diferencias que cada commit introduce"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples árboles de trabajo"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Crea un objeto árbol del índice actual"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definiendo atributos por ruta"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Interfaz y convenciones de línea de comandos de Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Un tutorial básico de Git para desarrolladores"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git para usuarios CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Afinar la salida de diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunto mínimo útil de comandos diarios de Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un Glosario de Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Hooks utilizados por Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submódulo"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Namespaces de Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposición del repositorio Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial de introducción a Git: parte dos"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Un tutorial de introducción para Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por "
+"Error: Tus cambios locales de los siguientes archivos serán sobrescritos por "
"la fusión"
#: git-merge-octopus.sh:61
msgstr ""
"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
" $realrepo\n"
-"use la opción '--force'. Si el directorio git local no es el repositorio "
+"usa la opción '--force'. Si el directorio git local no es el repositorio "
"correcto\n"
-"o no está seguro de lo que esto significa, escoja otro nombre con la opción "
+"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
"'--name'."
#: git-submodule.sh:286
msgid "See git-${cmd}(1) for details."
msgstr "Véase git-${cmd}(1) para más detalles."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Autostash aplicado."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No se puede almacenar $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Rebasando ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
"abajo.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
msgstr ""
-"Puede enmendar el commit ahora, con\n"
+"Puedes enmendar el commit ahora, con\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
-"Una vez que esté satisfecho con los cambios, ejecute\n"
+"Una vez que estés satisfecho con los cambios, ejecuta\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: no es un commit que pueda ser cogido"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nombre de commit inválido: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "No se puede escribir el remplazo sha1 del commit actual"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rápido a $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No se puede realizar avance rápido a $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "No se puede mover HEAD a $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Rehusando a ejecutar squash en fusión: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error rehaciendo fusión $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "No se pudo coger $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Este es el mensaje del commit #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El mensaje del commit #${n} será ignorado:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Esta es una combinación de $count commit."
msgstr[1] "Esta es la combinación de $count commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No se puede escribir $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Esto es una combinación de 2 commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No se puede aplicar $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"$rest\n"
"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
"commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el "
+"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
"problema antes\n"
"de que sea capaz de reformular el commit."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Detenido en $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No se puede '$squash_style' sin un commit previo"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Ejecutando: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ejecución fallida: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
msgstr ""
"La ejecución tuvo éxito: $rest\n"
"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
-"Realice un commit o stash con los cambios y, a continuación, ejecute\n"
+"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Comando desconocido: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "$head_name rebasado y actualizado satisfactoriamente."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
msgstr ""
-"Tiene cambios en el área de stage de su árbol de trabajo.\n"
+"Tienes cambios en el área de stage de tu árbol de trabajo.\n"
"Si estos cambios están destinados a \n"
-"ser aplastados en el commit previo, ejecute:\n"
+"ser aplastados en el commit previo, ejecuta:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
-"Si estos están destinados a ir en un nuevo commit, ejecute:\n"
+"Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"En ambos casos, cuando termine, continue con:\n"
+"En ambos casos, cuando termines, continue con:\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Error tratando de encontrar la identidad del autor para remediar el commit"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "No se pudo realizar el commit con los cambios en el área de stage."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "No se pudo ejecutar el editor"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "¿Sin HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No se pudo crear $state_dir temporalmente"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "No se pudo marcar como interactivo"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "No se puede inicializar los commits reescritos"
msgstr "Incapaz de determinar la ruta absoluta del directorio git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "rastreado"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "no rastreado"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binario"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "nada"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "sin cambios"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "agregada %d ruta\n"
msgstr[1] "agregadas %d rutas\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualizada %d ruta\n"
msgstr[1] "actualizadas %d rutas\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertida %d ruta\n"
msgstr[1] "revertidas %d rutas\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "touch hecho a %d ruta\n"
msgstr[1] "touch hecho a %d rutas\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Actualizar"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Revertir"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Agregar no rastreados"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "No hay archivos sin rastrear.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para el área de stage."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para aplicar stash."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para sacar del área de stage."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
"inmediatamente para aplicar."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
"inmediatamente para descarte."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"Lineas comenzando con %s serán removidas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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 esto no aplica de manera limpia, se le da la oportunidad de \n"
+"Si esto no aplica de manera limpia, se te da la oportunidad de \n"
"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
"la edición es abortada y el hunk queda sin cambios.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "falló al abrir el archivo de edición del hunk para lectura: %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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunko ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar este hunk al índice y al árbol de trabajo\n"
+"n - no aplicar este hunk al índice y al árbol de trabajo\n"
+"q - quit; no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"J - dejar este hunk por definir, ver siguiente hunk\n"
"k - dejar este hunk por definir, ver hunk previo por definir\n"
"K - dejar este hunk por definir, ver hunk previo\n"
-"s - dividir el hunk actual en hunks mas pequeños\n"
+"s - dividir el hunk actual en hunks más pequeños\n"
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Los hunks seleccionados no aplican al índice!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Aplicarlos al árbol de trabajo de todas maneras? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Nada fue aplicado.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorando lo no fusionado: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Actualización del parche"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "No hay más pedazos para el ir\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
-msgstr "a que hunk ir (<enter> para ver mas)? "
+msgstr "a que hunk ir (<enter> para ver más)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "a que hunk ir? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Numero inválido: '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lo siento, solo %d hunk disponible.\n"
msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "No hay más pedazos para buscar\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "buscar para regexp? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp para la búsqueda mal formado %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "No hay hunks que concuerden con el patrón entregado.\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "No el anterior hunk\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "No el siguiente hunk\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Perdón, no se puede dividir este pedazo\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Cortar en %d hunk.\n"
msgstr[1] "Cortar en %d hunks.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Perdón, no se puede editar este pedazo\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Revisión de diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"add untracked - agrega contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "modo --patch desconocido: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, se esperaba --"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "el editor se cerro inapropiadamente, abortando todo"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"'%s' contiene una versión intermedia del correo que se estaba generando.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contiene el email generado.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases no es compatible con otras opciones.\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"`batch-size` y `relogin` deben ser especificados juntos (via la línea de "
"comando o por opción de configuración)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Campo --suppress-cc desconocido: '%s'\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Configuración --confirm desconocida: '%s'\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "peligro: `:include:` no soportado: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "advertencia: línea sendmail no reconocida: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
" * Agregando la opción --format-patch si se quiere decir un rango.\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Falló al abrir directorio %s: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal: %s: %s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"No se especificaron parches!\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "No hay línea de subject en %s?"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Falló al abrir para escritura %s: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
msgstr ""
"Lineas que comienzan en \"GIT:\" serán removidas.\n"
"Considere incluir un diffstat global o una tabla de contenidos\n"
-"para el parche que está escribiendo.\n"
+"para el parche que estás escribiendo.\n"
"\n"
-"Limpiar el contenido de body si usted no desea mandar un resumen.\n"
+"Limpiar el contenido de body si no deseas mandar un resumen.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Falló al abrir %s: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Falló al abrir %s.final: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Archivo de resumen está vacío, saltando al siguiente\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "Esta seguro de que desea usar <%s> [y/N]? "
+msgstr "Estás seguro de que deseas usar <%s> [y/N]? "
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Que codificación de 8bit debería declarar [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
"deseas mandar.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "A quien se deben mandar los correos (si existe)?"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' se expande a si mismo\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si "
"existe alguno)? "
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr "error: no es posible extraer una dirección valida de %s\n"
+msgstr "error: no es posible extraer una dirección 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:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Ruta CA \"%s\" no existe"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" Este comportamiento is controlado por el valor de configuración "
"sendemail.confirm.\n"
"\n"
-" Para mas información, ejecuta 'git send-email --help'.\n"
+" Para más información, ejecuta 'git send-email --help'.\n"
" Para mantener el comportamiento actual, pero evitar este mensaje,\n"
" ejecuta 'git config --global sendemail.confirm auto'.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Necesitas mandar esta respuesta de email"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP no esta definido adecuadamente."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no soporta STARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Falló STARTTLS! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
"smtp-debug."
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Falló al enviar %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Dry-Sent %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Log dice:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Log dice:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultado: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falló al cerrar el pipe para '%s'"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codificación de transferencia inválida"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no es posible abrir %s: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
+msgstr "%s: el parche contiene una línea con más de 998 caracteres"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Realmente deseas mandar %s?[y|N]: "
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "El servidor soporta ulti_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "El servidor soporta no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "El servidor soporta multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "El servidor soporta side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "El servidor soporta side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "El servidor soporta allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "El servidor soporta allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "El servidor soporta ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD desacoplado en %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD desacoplado de %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Revisando archivos"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "falló al abrir '%s'"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "falló al analizar %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Si quiere saltar este commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
+#~ "para los commits restantes.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verbo no reconocido: %s"
+
#~ msgid "hash version %X does not match version %X"
#~ msgstr "versión de hash %X no concuerda con versión %X"
#~ msgid "cannot remove a locked working tree"
#~ msgstr "no se puede eliminar árbol de trabajo encerrado"
-#~ msgid "Applied autostash."
-#~ msgstr "Autostash aplicado."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "No se puede almacenar $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-02-15 10:09+0800\n"
-"PO-Revision-Date: 2019-06-05 11:20+0200\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-10 18:17+0200\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
+"X-Generator: Poedit 2.2.3\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
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:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:166
+#: advice.c:172
#, 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:174
+#: advice.c:180
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."
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Note : extraction de '%s'.\n"
+"Note : basculement sur '%s'.\n"
"\n"
"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "
"modifications\n"
-"expérimentales et les valider. Il vous suffit de faire une autre extraction "
+"expérimentales et les valider. Il vous suffit de faire un autre basculement "
"pour\n"
"abandonner les commits que vous faites dans cet état sans impacter les "
"autres branches\n"
"\n"
"Si vous voulez créer une nouvelle branche pour conserver les commits que "
"vous créez,\n"
-"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme "
-"ceci :\n"
+"il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n"
+"\n"
+" git switch -c <nom-de-la-nouvelle-branche>\n"
"\n"
-" git checkout -b <nom-de-la-nouvelle-branche>\n"
+"Ou annuler cette opération avec :\n"
+"\n"
+" git switch -\n"
+"\n"
+"Désactivez ce conseil en renseignant la variable de configuration advice."
+"detachedHead à false\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "citation non fermée"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "option d'espace non reconnue '%s'"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:950
+#: apply.c:922
#, 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:956
+#: apply.c:928
#, 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:957
+#: apply.c:929
#, 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:962
+#: apply.c:934
#, 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:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode invalide dans la ligne %d : %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "lignes d'entête inconsistantes %d et %d"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, 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:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"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:1584
+#: apply.c:1564
#, 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:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1850
+#: apply.c:1830
#, 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:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3066
+#: apply.c:3046
#, 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:3078
+#: apply.c:3058
#, 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:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3114
+#: apply.c:3094
#, 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:3161
+#: apply.c:3141
#, 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:3171
+#: apply.c:3151
#, 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:3179
+#: apply.c:3159
#, 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:3197
+#: apply.c:3177
#, 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:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3216
+#: apply.c:3196
#, 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:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3420
+#: 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:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3579
+#: apply.c:3559
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:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retour à une fusion à 3 points…\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Échec du retour à une fusion à 3 points…\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3966
+#: apply.c:3946
#, 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:3971
+#: apply.c:3951
#, 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:3991
+#: apply.c:3971
#, 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:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4102
+#: apply.c:4082
#, 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:4109
+#: apply.c:4089
#, 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:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4317
+#: apply.c:4297
#, 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:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4549
+#: apply.c:4529
#, 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:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4906
+#: apply.c:4886
#, 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:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, 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:4920
+#: apply.c:4900
#, 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:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "chemin"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "num"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4975
+#: apply.c:4955
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:4979
+#: apply.c:4959
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:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:4983
+#: apply.c:4963
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:4985
+#: apply.c:4965
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:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:4976
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:4998
+#: apply.c:4978
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:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "action"
-#: apply.c:5005
+#: apply.c:4985
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:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:5023
+#: apply.c:5003
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:5026
+#: apply.c:5006
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:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "racine"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
msgid "not a tree object: %s"
msgstr "objet arbre invalide : %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "l'arbre de travail actuel est non-suivi"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "préfixe"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fichier"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "dépôt"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
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:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "commande"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:489
+#: archive.c:491
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:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents et --reverse ne font pas bon ménage."
-#: blame.c:1808
+#: blame.c:2711
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:1829
+#: blame.c:2732
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:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
-#: blame.c:1856
+#: blame.c:2759
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:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "pas de chemin %s dans %s"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossible de lire le blob %s pour le chemin %s"
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "la vérification d'un colis requiert un dépôt"
+
+#: bundle.c:197
#, 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:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:203
+#: bundle.c:206
#, 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:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "impossible de dupliquer le descripteur de liasse"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:378
+#: bundle.c:381
#, 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:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1128
+#: commit.c:1127
#, 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."
-#: commit.c:1131
+#: commit.c:1130
#, 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."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1137
+#: commit.c:1136
#, 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"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
"projet.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "le graphe de commit est trop petit"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr ""
"la signature du graphe de commit %X ne correspond pas à la signature %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
"version %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"entrée de table de consultation de morceaux de graphe de commite manquante ; "
"le fichier est peut être incomplet"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois"
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "le graphe de commit n'a pas de section de graphes de base"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la chaîne de graphe de commit ne correspond pas"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "impossible de trouver tous les fichiers du graphe de commit"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "impossible d'obtenir le type de l'objet %s"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Lecture des commits connus dans un graphe de commit"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "Expansion des commits joignables dans un graphe de commit"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Suppression les marques de commit dans le graphe de commits"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Calcul des chiffres de génération du graphe de commits"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "erreur à l'ajout du packet %s"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "erreur à l'ouverture de l'index pour %s"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"
msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Comptage des commits distincts dans un graphe de commit"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "le graphe de commits ne peut pas écrire %d commits"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "trop de commits pour écrire un graphe"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "impossible de créer les répertoires de premier niveau de %s"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Écriture le graphe de commits en %d passe"
msgstr[1] "Écriture le graphe de commits en %d passes"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "impossible d'ouvrir le fichier de graphe de commit"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "échec du renommage du fichier de graphe de commits"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossible de renommer le fichier temporaire de graphe de commits"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Analyse des commits de fusion"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "id de commit %s dupliqué inattendu"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "fusion du graphe de commits"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "le graphe de commits ne peut pas écrire %d commits"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "trop de commits pour écrire un graphe"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"le graphe de commit a une somme de contrôle incorrecte et est "
"vraisemblablement corrompu"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
"%u != %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Verification des commits dans le graphe de commits"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
"graphe de commit"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
"%s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
"la liste des parents du graphe de commit pour le commit %s est trop longue"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "le parent du graphe de commit pour %s est %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
"non-nul ailleurs"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
"mais nul ailleurs"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "la génération du graphe de commit pour le commit %s est %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"les conditions d'inclusion de configuration relative doivent venir de "
"fichiers"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la clé ne contient pas de nom de variable : %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:805
+#: config.c:833
#, 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:809
+#: config.c:837
#, 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:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "hors plage"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:963
+#: config.c:998
#, 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:966
+#: config.c:1001
#, 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:969
+#: config.c:1004
#, 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:972
+#: config.c:1007
#, 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:975
+#: config.c:1010
#, 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:978
+#: config.c:1013
#, 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:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossible de charger l'objet blob de config '%s'"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "la référence '%s' ne pointe pas sur un blob"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2272
+#: config.c:2307
#, 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:2298
+#: config.c:2333
#, 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:2344
+#: config.c:2379
#, 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:2346
+#: config.c:2381
#, 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:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossible de réaliser un map de '%s'"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
"l'expression rationnelle depuis la configuration a trop de groupes de "
"capture (max=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Marquage de %d îlots, fait.\n"
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "afficher seulement la dernière ligne de --stat"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"afficher la distribution des quantités de modifications relatives pour "
"chaque sous-répertoire"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avertir si les modifications introduisent des marqueurs de conflit ou des "
"erreurs d'espace"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"résumé succinct tel que les créations, les renommages et les modifications "
"de mode"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "n'afficher que les noms et les status des fichiers modifiés"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "génerer un diffstat avec la largeur de nom indiquée"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"afficher les noms complets des objets pre- et post-image sur les lignes "
"\"index\""
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
"champs dans --raw ou --numstat"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"afficher le contexte entre les sections à concurrence du nombre de ligne "
"indiqué"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"casser les modifications d'une réécrire complète en paires de suppression et "
"création"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr ""
"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
"copie excède la limite indiquée"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heuristique qui déplace les limites de sections de diff pour faciliter la "
"lecture"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"afficher des différences par mot, en utilisant <mode> pour délimiter les "
"mots modifiés"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "utiliser <regex> pour décider ce qu'est un mot"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
"afficher les chemins relatifs"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "autoriser l'exécution d'un assistant externe de diff"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"lancer les filtres externes de conversion en texte lors de la comparaison de "
"fichiers binaires"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorer les modifications dans les sous-modules lors de la génération de diff"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<format>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "masquer les entrées 'git add -N' de l'index"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr ""
"afficher toutes les modifications dans l'ensemble de modifications avec -S "
"ou -G"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Sortie vers un fichier spécifié"
-#: diff.c:6150
+#: diff.c:6177
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:6153
+#: diff.c:6180
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:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fait"
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Le serveur ne supporte les clients superficiels"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Le serveur supporte multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Le serveur support no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Le serveur supporte multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Le serveur supporte side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Le serveru supporte side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Le serveur supporte allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Le serveur supporte ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Le serveur supporte filter"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Le serveur supporte %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Le serveur ne supporte les clients superficiels"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Le serveur ne supporte les requêtes superficielles"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Le serveur supporte filter"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, 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:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "type de liste de commandes non supporté '%s'"
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
msgid "sparse:path filters support has been dropped"
msgstr "sparse : le support des filtres de chemin a été abandonné"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "spécificateur de filtre invalide '%s'"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "impossible de modifier le prometteur distant de clone partiel"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, 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:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Échec de la fusion du sous-module %s (non extrait)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Échec de fusion du sous-module %s (commits non présents)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
"base de fusion)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Avance rapide du sous-module %s au commit suivant :"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avance rapide du sous-module %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"qui acceptera cette suggestion.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
"place."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
"%s de %s laissée dans l'arbre."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"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:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"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:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Refus de perdre le fichier modifié %s"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, 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:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, 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:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
"renommé."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
"en %s ; déplacé dans %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
"vers %s."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
"renommé en %s ; déplacé dans %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
"être déplacé vers %s."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, 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:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, 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:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "la version %u du condensé ne correspond pas"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "décalage de section invalide (trop grand)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
"identifiant de terminaison de tronçon d'index multi-paquet terminant "
"apparaît plus tôt qu'attendu"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "index multi-paquet manque de tronçon de recherche OID"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "index multi-paquet manque de tronçon de décalage d'objet"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Vérification de l'ordre des OID dans MIDX"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "Impossible de démarrer le groupement d'objets"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "Impossible de finir le groupement d'objets"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "impossible de créer le fil lazy_dir : %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "impossible de créer le fil lazy_name : %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "impossible de joindre le fil lazy_name : %s"
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:1868
+#: packfile.c:1899
#, 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 ?)"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "impossible d'analyser l'entête git '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossible d'analyser le journal pour '%s'"
msgstr "entrées de préparation non ordonnées pour '%s'"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
msgid "broken index, expect %s in %s, got %s"
msgstr "index cassé, %s attendu dans %s, %s obtenu"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
msgstr[0] "Rebasage de %s sur %s (%d commande)"
msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "impossible d'écrire '%s'"
"Les comportements disponibles sont : ignore, warn, error.\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s ne pointe pas sur un objet valide!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "symref pendant %s ignoré"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "impossible d'ouvrir '%s' en écriture : %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "impossible de lire la réf '%s'"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "la référence '%s' existe déjà"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "id d'objet inattendu pendant l'écriture de '%s'"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "id d'objet inattendu pendant la suppression de '%s'"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "le journal pour la réf %s contient un trou après %s"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "le journal pour la réf %s est vide"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "échec de update_ref pour la réf '%s' : %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "mises à jour multiples pour la réf '%s' non permises"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe ; impossible de créer '%s'"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossible de traiter '%s' et '%s' en même temps"
msgstr "spécificateur de réference invalide : '%s'"
# à priori on parle d'une branche ici
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "disparue"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "en avance de %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "en retard de %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argument %%(objectsize) non reconnu : %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) n'accepte pas d'argument"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valeur positive attendue objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(aucune branche, rebasage de %s)"
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
-
-#: ref-filter.c:1459
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(aucune branche, bisect a démarré sur %s)"
+msgid "no branch, rebasing %s"
+msgstr "aucune branche, rebasage de %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
+#: ref-filter.c:1488
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD détachée sur %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "aucune branche, rebasage de la HEAD détachée %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD détachée depuis %s)"
+msgid "no branch, bisect started on %s"
+msgstr "aucune branche, bisect a démarré sur %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(aucune branche)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "aucune branche"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "échec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "l'option « %s » est incompatible avec --merged"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "l'option « %s » est incompatible avec --no-merged"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
msgid "unable to open rr-cache directory"
msgstr "impossible d'ouvrir le répertoire rr-cache"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2479
+#: revision.c:2510
#, 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:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
msgid "could not delete '%s'"
msgstr "Impossible de supprimer '%s'"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossible de supprimer '%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revert"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Impossible de décoter la valeur de '%s'"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "format de date invalide '%s' dans '%s'"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "écriture du commit racine"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, 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:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, 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:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "annulation d'un picorage en cours"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "annulation d'un retour en cours"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "un picorage ou un retour est déjà en cours"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "un retour est déjà en cours"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "un picorage est déjà en cours"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "essayez \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, 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:2774
+#: sequencer.c:2818
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:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "Pas de retour en cours ?"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "aucun picorage en cours"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "échec du saut de commit"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "il n'y a rien à sauter"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"Avez-vous déjà validé ?\n"
+"essayez \"git %s -continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "impossible d'appliquer %s... %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
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:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "impossible de trouver l'arbre de %s"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "impossible d'écrire l'index"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "extraction de %s impossible"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s n'est pas un OID valide"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "arrêt à HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"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:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"rebase --continue'.\n"
"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "échec de mmap"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "le fichier objet %s est vide"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objet libre corrompu '%s'"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "données incorrectes à la fin de l'objet libre '%s'"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "type d'objet invalide"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "impossible de dépaqueter l'entête %s"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "impossible d'analyser l'entête %s"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "impossible de lire l'objet %s"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "remplacement %s non trouvé pour %s"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "impossible d'écrire le fichier %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossible de régler les droits de '%s'"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "erreur d'écriture d'un fichier"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "erreur en fermeture du fichier d'objet esseulé"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "impossible d'écrire le fichier d'objet esseulé"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossible de compresser le nouvel objet %s (%d)"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "échec de deflateEnd sur l'objet %s (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "données de source d'objet instable pour %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "échec de utime() sur %s"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "impossible de lire l'objet pour %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "commit corrompu"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "étiquette corrompue"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "erreur de lecture à l'indexation de %s"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "lecture tronquée pendant l'indexation de %s"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s : échec de l'insertion dans la base de données"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s : type de fichier non supporté"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s n'est pas un objet valide"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "incohérence de hachage pour %s (%s attendu)"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "impossible de mmap %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossible de dépaqueter l'entête de %s"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "impossible d'analyser l'entête de %s"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossible de dépaqueter le contenu de %s"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"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"
+"Git ne crée normalement jamais de référence qui se termine par 40\n"
+"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
+"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
"est créée.\n"
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u Gio"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u Gio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u Mio"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u Mio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u Kio"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u Kio/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u octet"
+msgstr[1] "%u octets"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u octet/s"
+msgstr[1] "%u octets/s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
msgid "Submodule '%s' could not be updated."
msgstr "le sous-module '%s' n'a pas pu être mis à jour."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
msgid "failed to push all needed submodules"
msgstr "échec de la poussée de tous les sous-modules nécessaires"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "option non supportée par le protocole"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "échec de l'écriture totale sur l'assistant distant"
msgid "error while running fast-import"
msgstr "erreur au lancement de fast-import"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "impossible de lire la réf %s"
msgid "helper %s does not support 'push-option'"
msgstr "l'assistant %s ne gère pas 'push-option'"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'assistant %s ne gère pas push ; un spécificateur de référence est "
"nécessaire"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'assistant %s ne gère pas 'force'"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "impossible de lancer fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "erreur au lancement de fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
"Vous devriez peut-être spécifier une branche telle que 'master'.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "réponse malformée dans le liste de réfs : %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "échec de read(%s)"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "échec de write(%s)"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "échec du fil d'exécution %s"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "échec de jonction du fil d'exécution %s : %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "échec du processus %s pour l'attente"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "échec du processus %s"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "impossible de démarrer le fil d'exécution pour copier les données"
msgid "empty filename in tree entry"
msgstr "nom de fichier vide dans une entrée de l'arbre"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fichier arbre trop court"
msgstr "Abandon\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Extraction des fichiers"
+msgid "Updating files"
+msgstr "Mise à jour des fichiers"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
"de travail"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (utilisez \"git restore --staged <fichier>...\" pour désindexer)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (utilisez \"git restore --source=%s --staged <fichier>...\" pour "
+"désindexer)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
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:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:226
+#: wt-status.c:238
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:228
+#: wt-status.c:240
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:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
-"dans la copie de travail)"
+" (utilisez \"git restore <fichier>...\" pour annuler les modifications dans "
+"le répertoire de travail)"
-#: wt-status.c:231
+#: wt-status.c:243
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:243
+#: wt-status.c:254
#, 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:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:896
+#: wt-status.c:906
#, 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:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard "
+"de la branche.\n"
+"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1128
+#: wt-status.c:1153
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:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, 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:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, 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:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, 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:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1350
+#: wt-status.c:1375
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:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1366
+#: wt-status.c:1391
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:1369
+#: wt-status.c:1394
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:1373
+#: wt-status.c:1398
#, 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:1378
+#: wt-status.c:1403
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:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1383
+#: wt-status.c:1408
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:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "Picorage en cours."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (lancez \"git cherry-pick --continue\" pour continuer)"
-#: wt-status.c:1410
+#: wt-status.c:1435
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:1412
+#: wt-status.c:1437
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:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Rétablissement en cours."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (lancez \"git revert --continue\" pour continuer)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, 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:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1456
+#: wt-status.c:1481
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:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, 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:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, 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:1753
+#: wt-status.c:1778
#, 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:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, 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:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "différent"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "simuler l'action"
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
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:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
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:1497
+#: builtin/am.c:1498
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:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1647
-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:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
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:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
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:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
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:2194
+#: builtin/am.c:2192
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:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
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:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "abandonne l'opération de patch mais garde HEAD où il est."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "afficher le patch en cours d'application."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, 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:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
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 "
"reprise."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "le mode interactif requiert des rustines sur la ligne de commande"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<options>] [<patch>...]"
msgid "bad HEAD - strange symbolic ref"
msgstr "mauvaise HEAD - référence symbolique douteuse"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "réference invalide : '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "effectuer 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "écrire les termes dans .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "vérifier l'état de la bissection"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "vérifier si des révisions sont attendues"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "réinitialiser l'état de la bissection"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "écrire l'état de la bissection dans BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "vérifier et régler les termes dans un état de la bissection"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "vérifier si les termes bons ou mauvais existent"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "afficher les termes de bissection"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "démarrer une session de bissection"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "pas de journal pour BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms exige deux arguments"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state ne supporte aucun argument"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms exige 3 arguments"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check exige 2 ou 3 arguments"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms exige 0 ou 1 argument"
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:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "couleur attendue : %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "doit finir avec une couleur"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valeur invalide pour blame.coloring"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "référence à ignorer %s introuvable"
+
+#: builtin/blame.c:845
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:795
+#: builtin/blame.c:846
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:796
+#: builtin/blame.c:847
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:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
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:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
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:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rév"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignore <rev> pendant le blâme"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorer les révisions listées dans <fichier>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
"colorer différemment les métadonnées redondantes avec la ligne précédente"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "colorier les lignes par âge"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
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:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "score"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
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:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, 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/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Assignation de blâme aux lignes"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"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:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"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:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, 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:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pointe hors de refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
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:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, 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:558
+#: builtin/branch.c:566
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:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
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:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "afficher le nom de la branche courante"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "objet"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "trop d'arguments pour spécifier une branche amont"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
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:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
+"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de "
+"branche.\n"
+"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "une seule option de traitement ne peut être spécifiée à la fois"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
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:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
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:642
+#: builtin/cat-file.c:643
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:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
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:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
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:653
+#: builtin/cat-file.c:654
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:657
+#: builtin/cat-file.c:658
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:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "ne pas ordonner la sortie de --batch-all-objects"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "chaîne"
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<options>] <branche>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<options>] <branche>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, 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:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d conflit du fusion recréé"
+msgstr[1] "%d conflits du fusion recréés"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d chemin mis à jour depuis %s"
+msgstr[1] "%d chemins mis à jour depuis %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d chemin mis à jour depuis l'index"
+msgstr[1] "%d chemins mis à jour depuis l'index"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, 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:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, 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:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "le chemin '%s' n'est pas fusionné"
+msgid "neither '%s' or '%s' is specified"
+msgstr "ni '%s', ni '%s' spécifié"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "%d conflit du fusion recréé"
-msgstr[1] "%d conflits du fusion recréés"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "%d chemin mis à jour depuis %s"
-msgstr[1] "%d chemins mis à jour depuis %s"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "%d chemin mis à jour depuis l'index"
-msgstr[1] "%d chemins mis à jour depuis l'index"
+msgid "path '%s' is unmerged"
+msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"suivants :\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
"les modifications indexées dans les fichiers suivants seraient perdues : %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "une seule référence attendue"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' pourrait être un fichier local ou un branche de suivi.\n"
"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "branche attendue, mais étiquette '%s' reçue"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "une branche est attendue, mais '%s' a été reçue"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "une branche est attendue, mais un commit '%s' a été reçu"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant une fusion\n"
+"Envisagez \"git merge --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant une session am\n"
+"Envisagez \"git am --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un rebasage\n"
+"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un picorage\n"
+"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"impossible de basculer de branche pendant un retour\n"
+"Envisagez \"git revert --quit\" ou \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "Vous basculez de branche en cours de bissection"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, 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:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' n'accepte pas <point-de-départ>"
+
+#: builtin/checkout.c:1388
#, 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:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "branche"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "créer et extraire une nouvelle branche"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "créer/réinitialiser et extraire une branche"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "créer un reflog pour une nouvelle branche"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "style"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "forcer l'extraction (laisser tomber les modifications locales)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1366
-msgid "checkout our version for unmerged files"
-msgstr "extraire notre version pour les fichiers non fusionnés"
-
-#: builtin/checkout.c:1369
-msgid "checkout their version for unmerged files"
-msgstr "extraire leur version pour les fichiers non fusionnés"
-
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
+#: builtin/checkout.c:1459 builtin/merge.c:288
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "style"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (merge (fusion) ou diff3)"
-
-#: builtin/checkout.c:1381
-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:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "ne pas essayer d'interpréter 'git checkout <branche-inexistante>'"
-
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1462
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:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forcer l'affichage de l'état d'avancement"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "utiliser le mode de superposition (défaut)"
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "extraire leur version pour les fichiers non fusionnés"
+
+#: builtin/checkout.c:1482
+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:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p et --overlay sont mutuellement exclusifs"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "impossible de résoudre %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "Vous devez spécifier un ou des chemins à restaurer"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, 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:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branche"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "créer et extraire une nouvelle branche"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "créer/réinitialiser et extraire une branche"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "créer un reflog pour une nouvelle branche"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "utiliser le mode de superposition (défaut)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "créer et basculer sur une nouvelle branche"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "créer/réinitialiser et basculer sur une branche"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "interpréter 'git switch <branche-inexistante>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "laisser tomber les modifications locales"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "de quel <arbre-esque> faire l'extraction"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "restaurer l'index"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "restaurer l'arbre de travail (par défaut)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorer les entrées non-fusionnées"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "utiliser le mode de superposition"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "lstat de %s impossible\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "nom"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "heure"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+"tous les sous-modules clonés utiliseront leur branche de suivi à distance"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"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:333
+#: builtin/clone.c:338
#, 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:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "échec à l'ouverture de '%s'"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "échec du stat de %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "échec du démarrage un itérateur sur '%s'"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec pour délier '%s'"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "échec de l'itération sur '%s'"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Le clone a réussi, mais l'extraction a échoué.\n"
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
-"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
+"et réessayer avec 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
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:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, 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:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, 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:999
+#: builtin/clone.c:1017
#, 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:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
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:1108
+#: builtin/clone.c:1126
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:1110
+#: builtin/clone.c:1128
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:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, 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:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
msgid "duplicate parent %s ignored"
msgstr "le parent dupliqué %s est ignoré"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "message de validation"
msgid "read commit log message from file"
msgstr "lire le message de validation depuis un fichier"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Sinon, veuillez utiliser 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Si vous souhaitez sauter ce commit, utilisez :\n"
+"utilisez ensuite :\n"
"\n"
-" git reset\n"
+" git cherry-pick --continue\n"
+"\n"
+"pour continuer le picorage des commits restants.\n"
+"Si vous souhaitez sauter ce commit, utilisez :\n"
+"\n"
+" git cherry-pick --skipped\n"
"\n"
-"Puis \"git cherry-pick --continue\" continuera le picorage \n"
-"des commits restants.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, 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:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, 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:1027
+#: builtin/commit.c:1030
#, 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:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
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:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
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:1147
+#: builtin/commit.c:1163
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:1157
+#: builtin/commit.c:1173
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:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
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:1184
+#: builtin/commit.c:1200
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:1186
+#: builtin/commit.c:1202
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:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "calcule les valeurs complètes en avance/en retard"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr ""
"détecter les renommages, en spécifiant optionnellement le facteur de "
"similarité"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "date"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
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:1484
+#: builtin/commit.c:1504
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:1485
+#: builtin/commit.c:1505
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:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, 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:1634
+#: builtin/commit.c:1654
#, 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:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"le dépôt a été mis à jour, mais impossible d'écrire le fichier\n"
"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."
+"n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <options de division>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "répertoire"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Le répertoire d'objet où stocker le graphe"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "impossible d'ouvrir le graphe de commit '%s'"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "commencer le parcours à toutes les réfs"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "commencer le parcours aux commits listés sur stdin"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
"inclure tous les commits déjà présents dans le fichier de graphe de commits"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"le nombre maximum de commits dans un graphe de commit divisé pas de base"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argument --type non reconnu, %s"
msgid "Type"
msgstr "Type"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "ce type est assigné à la valeur"
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valeur"
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "type"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de "
+"sortie"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"l'option `--default` attend une valeur entier long non signé avec `--"
+"type=ulong`, pas `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
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:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"sélectionner la gestion des messages de validation dans un encodage "
+"alternatif"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
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:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
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:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"les parents références qui ne sont pas dans le flux d'export rapide par id "
"d'objet"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Afficher les ids d'objet originaux des blobs/commits"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
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:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
"encombrent les étiquettes modifiées"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
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:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "lancer 'gc --auto' après la récupération"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, 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:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
+"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
+"'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
+"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n"
+"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
+
+#: builtin/fetch.c:888
#, 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:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
"extensions.partialClone"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
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:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
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:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
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/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
msgid "Checking %s link"
msgstr "Vérification du lien %s"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Vérification des objets"
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
"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:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, 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:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend une valeur numérique"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
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:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "afficher le numéro de colonne de la première correspondance"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "n'afficher que les parties correspondantes d'une ligne"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
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:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
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:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
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:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
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:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "option de combinaison invalide, ignore --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
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:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "option non supportée avec --recurse-submodules"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
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:1127
+#: builtin/grep.c:1129
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:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "type"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "type d'objet"
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "Mauvais chaîne alias.%s : %s"
msgid "'git help config' for more information"
msgstr "'git help config' pour plus d'information"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, 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:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
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:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "erreur de fsck dans l'objet empaqueté"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, 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:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, 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:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, 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:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossible d'écrire le fichier %s '%s'"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "impossible de fermer le fichier %s écrit '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, 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:1623
+#: builtin/index-pack.c:1643
#, 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:1630
+#: builtin/index-pack.c:1650
#, 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:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "erreur de fsck dans les objets paquets"
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:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "éditer les fichiers sur place"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "éliminer les lignes de fin vides"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "où placer les nouvelles lignes terminales"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "action si les lignes terminales existent déjà"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "action si les lignes terminales manquent"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "éliminer les lignes terminales vides"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "ne pas appliquer les règles de la configuration"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "joindre les valeurs continuées avec des caractères blancs"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "paramètres d'analyse"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "ne pas traiter spécialement ---"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "ligne(s) de fin à ajouter"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer n'a aucune signification avec --only-input"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "décorer seulement les références correspondant à <motif>"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "ne pas décorer les références correspondant à <motif>"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:177
+#: builtin/log.c:182
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:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "type inconnu : %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "exactement une plage nécessaire"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "échec de création du fichier de lettre de motivation"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "deux répertoires de sortie ?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "commit inconnu %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "échec à résoudre '%s' comme une référence valide"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement"
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
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:1386
+#: builtin/log.c:1409
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:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "échec d'inférence d'intervalles de différence d'intervalles"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
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:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
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:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
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:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
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:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr ""
"afficher la barre de progression durant la phase de génération des patchs"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "rév"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <rév> dans la première page ou une "
"rustine"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <refspec> dans la première page ou "
"une rustine"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "pourcentage par lequel la création est pondérée"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n et -k sont mutuellement exclusifs"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiert --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exécutable"
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
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:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
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:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
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:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
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:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
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:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "vérifier le crochet commit-msg"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, 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:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
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:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, 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:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"branche de sujet.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Un message vide abandonne la validation.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, 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:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
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:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
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:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit n'accepte pas d'argument"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
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:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
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:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#: builtin/merge.c:1366
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:1366
+#: builtin/merge.c:1383
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:1368
+#: builtin/merge.c:1385
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:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
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:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, 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:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, 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:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr "autoriser la création de plus d'un arbre"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<taille>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"répertoire objet contenant un ensemble de paires de fichiers paquet et "
"d'index de paquet"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
+"dans un lot plus grand que cette taille"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "trop d'arguments"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verbe non reconnu : %s"
+msgid "unrecognized subcommand: %s"
+msgstr "sous-commande non reconnue : %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorer les références correspondant à <motif>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
"validez le résultat avec 'git notes merges --commit', ou abandonnez la "
"fusion avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mauvais CRC d'objet empaqueté pour %s"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "objet empaqueté corrompu pour %s"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta récursif détecté pour l'objet %s"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objets commandés, %<PRIu32> attendus"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "le fichier packet est invalide : %s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "ouverture du fichier paquet pour réutilisation impossible : %s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "lecture du fichier de paquet réutilisé impossible"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
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:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
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:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "dépassement de décalage de base de delta pour %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "décalage de base de delta est hors limite pour %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "impossible de récupérer la taille de %s"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "impossible d'analyser l'entête d'objet de %s"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "l'objet %s ne peut être lu"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "valeur invalide pour --missing"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "l'objet libre à %s n'a pas pu être examiné"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
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:3247
+#: builtin/pack-objects.c:3255
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:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
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:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
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:3262
+#: builtin/pack-objects.c:3270
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:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleure correspondance des "
"deltas"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
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:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
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:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
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:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "utiliser l'algorithme de joignabilité creuse"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
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:3315
+#: builtin/pack-objects.c:3323
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:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "écrire un index de bitmap si possible"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
"transférer"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "la taille limite minimale d'un paquet est 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"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:432
+#: builtin/pull.c:435
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:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"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:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 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:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 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:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 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:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
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:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
msgid "keep empty commits"
msgstr "garder les validations vides"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
msgid "sign commits"
msgstr "signer les commits"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "afficher un diffstat de ce qui a changé en amont"
msgid "the command to run"
msgstr "la commande à lancer"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "re-planifier automatiquement tout `exec` qui échoue"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s requiert un rebasage interactif"
msgid "Cannot store %s"
msgstr "Impossible de stocker %s"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "impossible de déterminer la révision HEAD"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "commande exec vide"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "rebaser sur la branche %s au lieu de la branche amont"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passé à 'git am'"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git-apply"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "éditer la liste à faire lors d'un rebasage interactif"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "afficher le patch en cours d'application ou de fusion"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "préserver les validations vides pendant le rebasage"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "déplace les commits qui commencent par squash!/fixup! sous -i"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "remiser et réappliquer automatiquement avant et après"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "ajouter les lignes exec après chaque commit de la liste éditable"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "essayer de rebaser les fusions au lieu de les garder"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "utiliser la stratégie de fusion indiquée"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "passer les arguments jusqu'à la stratégie de fusion"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "rebaser tous les objets inatteignables depuis les racines"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"les support de rebase.useBuiltin a été supprimé !\n"
"Voir son entrée dans 'git help config' pour plus de détails."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la "
"place."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "Impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "Impossible de revenir à %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "impossible de supprimer '%s'"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "mode inconnu : %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"impossible de combiner les options am avec l'options interactive ou merge"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-"
"failed-exec'"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "impossible de combiner '--rebase-merges' avec '--strategy'"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': exactement une base de fusion nécessaire"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "ne pointe pas sur une validation valide : '%s'"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal : pas de branche ou commit '%s'"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Impossible de résoudre le commit HEAD vers un révision"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "réponse de remisage inattendue : '%s'"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossible de créer le répertoire pour '%s'"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Autoremisage créé : %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "impossible de réinitialiser --hard"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "Impossible de basculer vers %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branche courante %s est à jour.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branche courante %s est à jour, rebasage forcé.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
"dessus...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rapide de %s sur %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
"les objects de paquet."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"impossible de terminer pack-objects pour ré-empaqueter les objets de "
"prometteur"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
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:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
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:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
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:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
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:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"ALERTE : aussi échoué.\n"
"ALERTE : Veuillez les renommer manuellement dans %s :\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "le filtrage d'objet exige --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valeur invalide de 'sparse' '%s'"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
msgid "cancel revert or cherry-pick sequence"
msgstr "annuler le retour ou picorage"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "sauter le commit courant et continuer"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "ne pas valider automatiquement"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "éditer le message de validation"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "numéro-de-parent"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "sélectionner le parent principal"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "stratégie de fusion"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
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:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "aucune référence correspond à %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
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:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
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:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
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:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
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:712
+#: builtin/show-branch.c:711
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:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog requiert un nom de branche"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, 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:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
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"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "impossible d'exécuter %s"
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:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
"run_command a retourné un statut non-nul pour %s\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"modules inclus de %s\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<options>] [<chemin>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "supprimer la sortie d'état du sous-module"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
"du sous-module"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr ""
"Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossible de créer le répertoire vide du sous-module %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]"
msgstr ""
"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, 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:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:500
+#: builtin/tag.c:510
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:502
+#: builtin/tag.c:512
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:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "afficher le contenu du commit"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "afficher les messages bruts de gpg"
msgid "show statistics only"
msgstr "afficher seulement les statistiques"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "échec de la suppression de '%s'"
"'%s' est un arbre de travail manquant mais déjà enregistré ;\n"
"utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
"précédemment sur %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
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:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "essayer de nommer la nouvelle branche comme la branche amont"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"les arbres de travail contenant des sous-modules ne peuvent pas être "
"déplacés ou supprimés"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "la cible '%s' existe déjà"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' est sale, utilisez --force pour le supprimer"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "impossible de lancer 'git status' sur '%s', code %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n"
"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."
+"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
+"Voir 'git help git' pour un survol du système."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "aucun répertoire fourni pour --git-dir\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "aucun répertoire fourni pour --work-tree\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "aucun préfixe fourni pour --super-prefix\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c requiert une chaîne de configuration\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "aucun répertoire fourni pour -C\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "option inconnue : %s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "lors de l'expansion de l'alias '%s' : '%s'"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"l'alias '%s' modifie les variables d'environnement.\n"
"Vous pouvez utiliser '!git' dans l'alias pour le faire"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "alias vide pour %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursif : %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "échec d'écriture sur la sortie standard"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "échec inconnu d'écriture sur la sortie standard"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "impossible d'utiliser %s comme une fonction intégrée"
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"usage : %s\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "échec au lancement de la commande '%s' : %s\n"
msgid "no-op (backward compatibility)"
msgstr "sans action (rétrocompatibilité)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr "être plus verbeux"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr "être plus silencieux"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Ajouter le contenu de fichiers dans l'index"
msgstr "Réinitialiser la HEAD courante à l'état spécifié"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "restaurer les fichiers l'arbre de travail"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Inverser des commits existants"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Analyser et préparer les paramètres"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Supprimer des fichiers de la copie de travail et de l'index"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Envoyer un ensemble de patchs comme courriels"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "shell de login restreint pour un accès SSH vers Git seulement"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Résumer la sortie de 'git log'"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Afficher différents types d'objets"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Afficher les branches et leurs commits"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Afficher l'index de l'archive empaquetée"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Lister les références du dépôt local"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Le code d'initialisation i18n pour les scripts shell"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Le code d'initialisation commun aux scripts shell Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Remiser les modifications d'un répertoire de travail sale"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Ajouter le contenu de fichiers à l'index"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Retirer les espaces inutiles"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Basculer de branche"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Lire, modifier et supprimer les références symboliques"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Créer un fichier temporaire avec le contenu d'un blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Dépaqueter les objets depuis une archive empaquetée"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr ""
"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
"idiots"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Renvoyer une archive dans git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Afficher un variable logique de Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Vérifier la signature GPG de commits"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Valider des fichiers d'archive Git empaquetés"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Vérifier la signature GPG d'étiquettes"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interface web de Git"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Afficher les journaux avec la différence que chaque commit introduit"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Gère de arbres de travail multiples"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Créer un objet arbre depuis l'index courant"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "interface en ligne de commande et conventions de Git"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Tutoriel du cœur de Git pour les développeurs"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git pour les utilisateurs de CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Un glossaire Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Espaces de nom de Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Disposition d'un dépôt Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Une introduction pratique à Git : deuxième partie"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Une introduction pratique à Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
msgid "See git-${cmd}(1) for details."
msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Autoremisage appliqué."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Impossible de stocker $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Rebasage ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"\n"
"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1 n'est pas un commit qui peut être picorer"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de commit invalide : $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rapide sur $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Avance rapide impossible sur $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Impossible de déplacer HEAD sur $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Refus d'écraser un commit de fusion: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Erreur lors de la réapplication de la fusion $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Impossible de picorer $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Ceci est le ${n}ième message de validation :"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Le message de validation ${n} sera ignoré :"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Ceci est la combinaison de $count commit."
msgstr[1] "Ceci est la combinaison de $count commits."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Impossible d'écrire $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Ceci est la combinaison de 2 commits."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Impossible d'appliquer $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"le\n"
"problème avant de pouvoir reformuler le message du commit."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Arrêté à $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "'$squash_style' impossible avec le commit précédent"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Exécution : $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'exécution a échoué : $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "et a mis à jour l'index ou la copie de travail"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Commande inconnue : $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Rebasage et mise à jour de $head_name avec succès."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
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:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %s12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "indexé"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "non-indexé"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binaire"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "rien"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "inchangé"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, 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:612
+#: git-add--interactive.perl:626
#, 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:615
+#: git-add--interactive.perl:629
#, 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:618
+#: git-add--interactive.perl:632
#, 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:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Mise à jour"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Inverser"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme indexée."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme remisée."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme desindexée."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme appliquée."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme éliminée."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, 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:1086
+#: git-add--interactive.perl:1110
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:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"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:1100
+#: git-add--interactive.perl:1124
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"
"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:1114
+#: git-add--interactive.perl:1138
#, 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"
#. 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:1213
+#: git-add--interactive.perl:1237
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:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"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:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"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:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"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:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"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:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"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:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"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:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"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:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - appliquer cette section à l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"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:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
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:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, 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:1391
+#: git-add--interactive.perl:1427
#, 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:1392
+#: git-add--interactive.perl:1428
#, 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:1395
+#: git-add--interactive.perl:1431
#, 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:1396
+#: git-add--interactive.perl:1432
#, 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:1397
+#: git-add--interactive.perl:1433
#, 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:1400
+#: git-add--interactive.perl:1436
#, 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:1401
+#: git-add--interactive.perl:1437
#, 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:1402
+#: git-add--interactive.perl:1438
#, 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:1405
+#: git-add--interactive.perl:1441
#, 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:1406
+#: git-add--interactive.perl:1442
#, 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:1407
+#: git-add--interactive.perl:1443
#, 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:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, 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:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, 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:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, 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:1415
+#: git-add--interactive.perl:1451
#, 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:1416
+#: git-add--interactive.perl:1452
#, 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:1417
+#: git-add--interactive.perl:1453
#, 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:1420
+#: git-add--interactive.perl:1456
#, 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:1421
+#: git-add--interactive.perl:1457
#, 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:1422
+#: git-add--interactive.perl:1458
#, 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:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Aucune autre section à atteindre\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "aucune autre section à rechercher\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "rechercher la regex ? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Désolé, impossible de découper cette section\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, 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:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Désolé, impossible d'éditer cette section\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
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:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"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:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
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:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, 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:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
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:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
"commande ou des options de configuration)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, 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:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, 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:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 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:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"fatal : %s : %s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, 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:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
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:936
+#: git-send-email.perl:963
#, 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:948
+#: git-send-email.perl:975
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 "
"a) ? "
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
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:1018
+#: git-send-email.perl:1045
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:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
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:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "échec de STARTTLS ! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
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:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "échec de l'envoi de %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, 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:1638
+#: git-send-email.perl:1665
#, 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:1691
+#: git-send-email.perl:1718
#, 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:1726
+#: git-send-email.perl:1753
#, 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:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, 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:1947
+#: git-send-email.perl:1974
#, 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:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:174
+#: advice.c:180
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 ""
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
msgid "unclosed quote"
msgstr ""
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr ""
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr ""
-#: apply.c:4549
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr ""
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr ""
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr ""
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr ""
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr ""
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr ""
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr ""
msgid "not a tree object: %s"
msgstr ""
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr ""
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr ""
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr ""
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr ""
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr ""
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr ""
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr ""
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr ""
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr ""
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr ""
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr ""
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr ""
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr ""
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr ""
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr ""
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr ""
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr ""
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr ""
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr ""
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr ""
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr ""
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr ""
"%s"
msgstr ""
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr ""
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr ""
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr ""
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr ""
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr ""
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr ""
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr ""
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr ""
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr ""
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr ""
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr ""
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr ""
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr ""
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr ""
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr ""
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr ""
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr ""
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr ""
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr ""
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr ""
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr ""
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr ""
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr ""
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr ""
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr ""
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr ""
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr ""
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
msgid "giving up"
msgstr ""
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr ""
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr ""
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr ""
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr ""
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr ""
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr ""
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr ""
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
+#: fetch-pack.c:908
+#, c-format
+msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:959
-#, c-format
-msgid "Server version is %.*s"
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr ""
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr ""
msgid "sparse:path filters support has been dropped"
msgstr ""
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr ""
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, 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 ""
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr ""
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr ""
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr ""
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr ""
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr ""
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr ""
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr ""
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr ""
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr ""
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr ""
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "unable to parse --pretty format"
msgstr ""
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
msgstr ""
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr ""
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr ""
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr ""
"\n"
msgstr ""
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr ""
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr ""
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr ""
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
msgid "invalid refspec '%s'"
msgstr ""
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr ""
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr ""
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr ""
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr ""
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr ""
-
-#: ref-filter.c:1459
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "no branch, rebasing %s"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
+#: ref-filter.c:1488
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "no branch, rebasing detached HEAD %s"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "no branch, bisect started on %s"
msgstr ""
-#: ref-filter.c:1478
-msgid "(no branch)"
+#: ref-filter.c:1501
+msgid "no branch"
msgstr ""
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr ""
msgid "unable to open rr-cache directory"
msgstr ""
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: sequencer.c:321
msgid "revert"
msgstr ""
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr ""
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:385
+#: sequencer.c:388
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 ""
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr ""
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1843
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr ""
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr ""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr ""
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr ""
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr ""
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr ""
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr ""
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr ""
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr ""
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr ""
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr ""
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr ""
-
-#: submodule.c:118 submodule.c:147
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "%u.%2.2u GiB"
msgstr ""
-#: submodule.c:154
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "%u.%2.2u GiB/s"
msgstr ""
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
msgstr ""
-#: submodule.c:327
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "%u.%2.2u MiB/s"
msgstr ""
-#: submodule.c:358
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "%u.%2.2u KiB"
msgstr ""
-#: submodule.c:910
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgid "%u.%2.2u KiB/s"
msgstr ""
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: submodule.c:1481
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ""
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr ""
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: submodule.c:1481
#, c-format
msgid "Could not access submodule '%s'"
msgstr ""
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr ""
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr ""
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr ""
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr ""
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr ""
msgstr ""
#: unpack-trees.c:318
-msgid "Checking out files"
+msgid "Updating files"
msgstr ""
#: unpack-trees.c:350
msgid "invalid '..' path segment"
msgstr ""
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
msgid "unable to get current working directory"
msgstr ""
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr ""
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr ""
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr ""
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr ""
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr ""
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr ""
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr ""
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr ""
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr ""
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr ""
-#: wt-status.c:896
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr ""
-#: wt-status.c:1289
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr ""
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr ""
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr ""
-#: wt-status.c:1741
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr ""
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr ""
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr ""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr ""
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr ""
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr ""
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr ""
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2276
+#: builtin/am.c:2274
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr ""
msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr ""
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr ""
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr ""
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr ""
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr ""
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr ""
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr ""
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr ""
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr ""
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr ""
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr ""
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr ""
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
+msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "'%s' must be used when '%s' is not specified"
+msgstr ""
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] ""
-msgstr[1] ""
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr ""
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] ""
-msgstr[1] ""
+msgid "path '%s' is unmerged"
+msgstr ""
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr ""
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1292
-msgid "paths cannot be used with switching branches"
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1305
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1309
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1361 builtin/worktree.c:496
-msgid "detach HEAD at named commit"
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1362
-msgid "set upstream info for new branch"
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1364
-msgid "new-branch"
+#: builtin/checkout.c:1352
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1364
-msgid "new unparented branch"
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#, c-format
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1366
-msgid "checkout our version for unmerged files"
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#, c-format
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1369
-msgid "checkout their version for unmerged files"
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
+#: builtin/checkout.c:1388
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
msgid "style"
msgstr ""
-#: builtin/checkout.c:1378
+#: builtin/checkout.c:1440
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1381
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1457
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1462
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr ""
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr ""
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr ""
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr ""
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr ""
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr ""
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr ""
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr ""
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr ""
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr ""
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr ""
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr ""
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr ""
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr ""
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr ""
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
+msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr ""
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr ""
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr ""
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
msgstr ""
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:653
+#: 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:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr ""
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr ""
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr ""
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr ""
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
msgid "Type"
msgstr ""
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr ""
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr ""
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr ""
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr ""
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr ""
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr ""
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
msgstr ""
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr ""
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr ""
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr ""
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr ""
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr ""
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr ""
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr ""
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr ""
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr ""
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr ""
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr ""
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr ""
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr ""
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr ""
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr ""
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr ""
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr ""
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr ""
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr ""
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr ""
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr ""
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr ""
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr ""
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr ""
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr ""
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1351
+#: builtin/log.c:1374
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr ""
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr ""
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr ""
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr ""
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr ""
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr ""
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr ""
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr ""
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1606
-msgid "rev"
-msgstr ""
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr ""
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr ""
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr ""
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr ""
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1349
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
msgstr ""
#: builtin/merge.c:1366
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr ""
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
msgstr ""
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr ""
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
+msgid "unrecognized subcommand: %s"
msgstr ""
#: builtin/mv.c:18
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr ""
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgid "keep empty commits"
msgstr ""
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr ""
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr ""
msgid "Cannot store %s"
msgstr ""
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"abort\"."
msgstr ""
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
"\n"
msgstr ""
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
msgstr ""
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr ""
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr ""
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr ""
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
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"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr ""
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr ""
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:106
-msgid "don't automatically commit"
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
msgstr ""
#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr ""
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr ""
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr ""
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr ""
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
"."
msgstr ""
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"."
msgstr ""
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"want to.\n"
msgstr ""
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr ""
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr ""
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr ""
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr ""
msgid "show statistics only"
msgstr ""
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr ""
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr ""
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr ""
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr ""
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr ""
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr ""
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr ""
msgid "update the index with reused conflict resolution if possible"
msgstr ""
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr ""
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr ""
msgstr ""
#: command-list.h:156
-msgid "Revert some existing commits"
+msgid "Restore working tree files"
msgstr ""
#: command-list.h:157
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:158
-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:159
-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:160
-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:161
-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:162
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:163
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:164
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:165
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:166
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:167
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:168
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:169
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:170
-msgid "Stash the changes in a dirty working directory away"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:171
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:172
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:173
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:174
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:175
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:176
-msgid "Read, modify and delete symbolic refs"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:177
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Switch branches"
msgstr ""
#: command-list.h:178
-msgid "Creates a temporary file with a blob's contents"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:179
-msgid "Unpack objects from a packed archive"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:180
-msgid "Register file contents in the working tree to the index"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:181
-msgid "Update the object name stored in a ref safely"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:182
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:183
-msgid "Send archive back to git-archive"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:184
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:185
-msgid "Show a Git logical variable"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:186
-msgid "Check the GPG signature of commits"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:187
-msgid "Validate packed Git archive files"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:188
-msgid "Check the GPG signature of tags"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:189
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:190
-msgid "Show logs with difference each commit introduces"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:191
-msgid "Manage multiple working trees"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:192
-msgid "Create a tree object from the current index"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:193
-msgid "Defining attributes per path"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:194
-msgid "Git command-line interface and conventions"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:195
-msgid "A Git core tutorial for developers"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:196
-msgid "Git for CVS users"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:197
-msgid "Tweaking diff output"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:198
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:199
-msgid "A Git Glossary"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:200
-msgid "Hooks used by Git"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:201
-msgid "Specifies intentionally untracked files to ignore"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:202
-msgid "Defining submodule properties"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:203
-msgid "Git namespaces"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:204
-msgid "Git Repository Layout"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:205
-msgid "Specifying revisions and ranges for Git"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:206
-msgid "A tutorial introduction to Git: part two"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:207
-msgid "A tutorial introduction to Git"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:208
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:209
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr ""
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr ""
msgstr ""
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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 ""
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:948
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
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:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-03 21:37+0200\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-11 11:48+0200\n"
"Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n"
"Language-Team: Italian <>\n"
"Language: it\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.04.1\n"
+"X-Generator: Lokalize 19.04.3\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%ssuggerimento: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Il cherry picking non è possibile perché ci sono file di cui non è stato "
"eseguito il merge."
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Il commit non è possibile perché ci sono file di cui non è stato eseguito il "
"merge."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Il merge non è possibile perché ci sono file di cui non è stato eseguito il "
"merge."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Il pull non è possibile perché ci sono file di cui non è stato eseguito il "
"merge."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Il revert non è possibile perché ci sono file di cui non è stato eseguito il "
"merge."
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito "
"il merge."
-#: advice.c:174
+#: advice.c:180
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."
"Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come "
"appropriato per risolverli ed esegui un commit."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Esco a causa di un conflitto non risolto."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Esegui il commit delle modifiche prima di eseguire il merge."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Esco a causa di un merge non terminato."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
"Nota: eseguo il checkout di '%s'.\n"
"sperimentali ed eseguirne il commit, e puoi scartare qualunque commit "
"eseguito\n"
"in questo stato senza che ciò abbia alcuna influenza sugli altri branch "
-"eseguendo\n"
-"un nuovo checkout.\n"
+"tornando\n"
+"su un branch.\n"
"\n"
"Se vuoi creare un nuovo branch per mantenere i commit creati, puoi farlo\n"
-"(ora o in seguito) rieseguendo il checkout con il parametro -b. Ad esempio:\n"
+"(ora o in seguito) usando l'opzione -c con il comando switch. Ad esempio:\n"
+"\n"
+" git switch -c <nome nuovo branch>\n"
"\n"
-" git checkout -b <nome-nuovo-branch>\n"
+"Oppure puoi annullare quest'operazione con:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Disattiva questo consiglio impostando la variabile di configurazione\n"
+"advice.detachedHead a false\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "virgolette non chiuse"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "opzione spazi bianchi '%s' non riconosciuta"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "opzione ignora spazi bianchi '%s' non riconosciuta"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject e --3way non possono essere usati insieme."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached e --3way non possono essere usati insieme."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way al di fuori di un repository"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index al di fuori di un repository"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached al di fuori di un repository"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossibile preparare l'espressione regolare timestamp %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha restituito %d per l'input: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "impossibile trovare il nome del file nella patch alla riga %d"
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d"
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff errato - atteso /dev/null alla riga %d"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
-msgstr "modalità non valida alla riga %d: %s"
+msgstr "modo non valido alla riga %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "righe di intestazione %d e %d inconsistenti"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: riga inattesa: %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "frammento di patch senza intestazione alla riga %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"l'intestazione git diff non riporta le informazioni sul file una volta "
"rimossi %d componenti iniziali del percorso (riga %d)"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
-msgstr "il nuovo file dipende da contenuti precedenti"
+msgstr "il nuovo file dipende da vecchi contenuti"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "il file eliminato ha ancora dei contenuti"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrotta alla riga %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
-msgstr "il nuovo file %s dipende da contenuti precedenti"
+msgstr "il nuovo file %s dipende da vecchi contenuti"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "il file eliminato %s ha ancora dei contenuti"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaria corrotta alla riga %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaria non riconosciuta alla riga %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch con soli contenuti garbage alla riga %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "impossibile leggere il collegamento simbolico %s"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "impossibile aprire o leggere %s"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inizio della riga non valido: '%c'"
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)."
msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)."
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-"durante la ricerca per:\n"
+"durante la ricerca di:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "dati della patch binaria mancanti per '%s'"
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossibile applicare una patch binaria al contrario senza l'hunk contrario "
"per '%s'"
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossibile applicare una patch binaria a '%s' senza la riga d'indice "
"completa"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
"la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti "
"del file."
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr "la patch si applica a un file vuoto '%s' ma non è vuoto"
+msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "impossibile leggere la postimmagine %s necessaria per '%s'"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "la patch binaria non si applica correttamente a '%s'"
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch non riuscita: %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "impossibile eseguire il checkout di '%s'"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "lettura di %s non riuscita"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lettura di '%s' oltre un collegamento simbolico"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "il percorso %s è stato rinominato/eliminato"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: non esiste nell'indice"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: non corrisponde all'indice"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"dal repository manca il blob necessario per ripiegare sul merge a tre vie."
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Ripiego sul merge a tre vie...\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossibile leggere i contenuti correnti di '%s'"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Ripiego sul merge a tre vie non riuscito...\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch applicata a '%s' con conflitti.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch '%s' applicata correttamente.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "la rimozione della patch lascia contenuti del file"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipo errato"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ha il tipo %o, atteso %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
-msgstr "percorso non valido: %s"
+msgstr "percorso '%s' non valido"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: esiste già nell'indice"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: esiste già nella directory di lavoro"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
-"la nuova modalità (%o) di %s non corrisponde alla vecchia modalità (%o)"
+msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)"
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
-"la nuova modalità (%o) di %s non corrisponde alla vecchia modalità (%o) di %s"
+msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s"
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "il file interessato '%s' si trova oltre un collegamento simbolico"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: la patch non si applica correttamente"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Controllo della patch %s in corso..."
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili"
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
-msgstr "modifica modalità per %s che non è nell'HEAD corrente"
+msgstr "modifica modo per %s che non è nell'HEAD corrente"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "le informazioni SHA1 sono mancanti o inutili (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry non riuscito per il percorso '%s'"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossibile aggiungere %s all'indice temporaneo"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossibile scrivere l'indice temporaneo in %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "impossibile rimuovere %s dall'indice"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrotta per il sottomodulo %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "impossibile eseguire lo stat del file appena creato '%s'"
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "impossibile creare l'archivio di backup per il file appena creato %s"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "impossibile aggiungere la voce della cache per %s"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "scrittura in '%s' non riuscita"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "chiusura del file '%s' in corso"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr "impossibile scrivere il file '%s' in modalità %o"
+msgstr "impossibile scrivere il file '%s' con modo %o"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s applicata correttamente."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "errore interno"
-#: apply.c:4549
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Applicazione della patch %%s con %d frammento respinto..."
msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..."
-#: apply.c:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "nome file .rej troncato a %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "impossibile aprire %s"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Frammento %d applicato correttamente."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Frammento %d respinto."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ignorata."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "input non riconosciuto"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "impossibile leggere il file index"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "impossibile aprire la patch '%s': %s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d errore di spazi bianchi soppresso"
msgstr[1] "%d errori di spazi bianchi soppressi"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d riga aggiunge errori di spazi bianchi."
msgstr[1] "%d righe aggiungono errori di spazi bianchi."
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi."
msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Impossibile scrivere il nuovo file index"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "percorso"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "non applicare le modifiche corrispondenti al percorso specificato"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "applica le modifiche corrispondenti al percorso specificato"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "num"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignora le aggiunte create dalla patch"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
-msgstr "invece di applicare la patch, mostra l'output di diffstat per l'input"
+msgstr ""
+"invece di applicare la patch, visualizza l'output di diffstat per l'input"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
-msgstr "mostra il numero di righe aggiunte ed eliminate in notazione decimale"
+msgstr ""
+"visualizza il numero di righe aggiunte ed eliminate in notazione decimale"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
-msgstr "invece di applicare la patch, mostra un riassunto per l'input"
+msgstr "invece di applicare la patch, visualizza un riassunto per l'input"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "invece di applicare la patch, verifica se può essere applicata"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "assicura che la patch sia applicabile all'indice corrente"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "contrassegna i nuovi file con `git add --intent-to-add`"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "applica una patch senza modificare l'albero di lavoro"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
"accetta una patch che apporta modifiche al di fuori dell'area di lavoro"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "applica anche la patch (da usare con --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "prova un merge a tre vie se la patch non si applica correttamente"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "compila un index temporaneo basato sulle informazioni indice incluse"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "i percorsi sono separati con un carattere NUL"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
-msgstr "assicura almeno <n> righe di contesto corrispondente"
+msgstr "assicura che almeno <n> righe di contesto corrispondano"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "azione"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "applica la patch in maniera inversa"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "non aspettare almeno una riga di contesto"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lascia i frammenti respinti nei file *.rej corrispondenti"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "consenti la sovrapposizione dei frammenti"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "visualizza ulteriori dettagli"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tollera carattere fine riga rilevato erroneamente come mancante alla fine "
"del file"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr ""
"non fare affidamento sul numero di righe nelle intestazioni dei frammenti"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "radice"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
-msgstr "anteponi <root> a tutti i nomi file"
+msgstr "anteponi <radice> a tutti i nomi file"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgid "not a tree object: %s"
msgstr "%s non è un oggetto albero valido"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "la directory di lavoro corrente non è tracciata"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "formato archivio"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "prefisso"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "file"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "scrivi l'archivio in questo file"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "leggi il file .gitattributes nella directory di lavoro"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "elenca i file archiviati sullo standard error"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "salva solamente"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "comprimi più velocemente"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "comprimi meglio"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "elenca i formati archivio supportati"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "repository"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'archivio dal repository remoto <repository>"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "percorso al comando remoto git-upload-archive"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Opzione --remote inattesa"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "L'opzione --exec può essere usata solo con --remote"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Opzione --output inattesa"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato archivio '%s' sconosciuto"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argomento non supportato per il formato '%s': -%d"
#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "modalità file non supportata: 0%o (SHA1: %s)"
+msgstr "modo file non supportato: 0%o (SHA1: %s)"
#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "errore deflate (%d)"
"Use '\\!' for literal leading exclamation."
msgstr ""
"I pattern negativi sono ignorati negli attributi git\n"
-"Usare '\\!' per specificare un punto esclamativo iniziale letteralmente."
+"Usa '\\!' per specificare letteralmente un punto esclamativo iniziale."
#: bisect.c:468
#, c-format
msgid "a %s revision is needed"
msgstr "è richiesta una revisione %s"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "impossibile creare il file '%s'"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "impossibile leggere il file '%s'"
msgstr[1] ""
"Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents e --reverse non sono compatibili."
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "impossibile usare --contents con il nome oggetto del commit finale"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
"specificato l'ultimo commit"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "impostazione percorso revisioni non riuscita"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
"specificato un intervallo nella catena del primo commit genitore"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "il percorso %s in %s non esiste"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossibile leggere il blob %s per il percorso %s"
msgid "Not a valid branch point: '%s'."
msgstr "Punto di branch non valido: '%s'."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "Il checkout di '%s' è già stato eseguito in '%s'"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "L'HEAD dell'albero di lavoro %s non è aggiornato"
msgid "unrecognized header: %s%s (%d)"
msgstr "intestazione non riconosciuta: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "impossibile aprire '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Dal repository mancano questi commit richiesti come prerequisito:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "è necessario un repository per verificare un bundle"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Il bundle contiene questo ref:"
-msgstr[1] "Il bundle contiene questi %d ref:"
+msgstr[0] "Il bundle contiene questo riferimento:"
+msgstr[1] "Il bundle contiene questi %d riferimenti:"
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
-msgstr "Il bundle registra una cronologia completa."
+msgstr "Nel bundle è registrata una cronologia completa."
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Il bundle richiede questo ref:"
-msgstr[1] "Il bundle richiede questi %d ref:"
+msgstr[0] "Il bundle richiede questo riferimento:"
+msgstr[1] "Il bundle richiede questi %d riferimenti:"
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "impossibile duplicare il descrittore bundle"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Impossibile avviare pack-objects"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "comando pack-objects morto"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "comando rev-list morto"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
-msgstr "il ref '%s' è escluso dalle opzioni di rev-list"
+msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argomento non riconosciuto: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Mi rifiuto di creare un bundle vuoto."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "impossibile creare '%s'"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "comando index-pack morto"
msgid "invalid color value: %.*s"
msgstr "valore colore non valido: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "impossibile analizzare %s"
msgid "%s %s is not a commit!"
msgstr "%s %s non è un commit!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Il supporto per <GIT_DIR>/info/graft è deprecato\n"
"e sarà rimosso in una versione futura di Git.\n"
"\n"
-"Usare \"git replace --convert-graft-file\"\n"
+"Usa \"git replace --convert-graft-file\"\n"
"per convertire i graft in ref sostitutivi.\n"
"\n"
-"Per disabilitare questo messaggio, eseguire\n"
+"Per disabilitare questo messaggio, esegui\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s."
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Il commit %s non ha una firma GPG."
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Il commit %s ha una firma GPG valida di %s\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"la variabile di configurazione i18n.commitencoding alla codifica usata\n"
"dal tuo progetto.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "il file grafo dei commit %s è troppo piccolo"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
"la versione hash del grafo dei commit %X non corrisponde alla versione %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
"potrebbe non essere completo"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "offset blocco grafo dei commit improprio %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "l'ID del blocco grafo dei commit %08x compare più volte"
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "il grafo dei commit non ha un blocco grafi di base"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "la catena del grafo dei commit non corrisponde"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "impossibile trovare tutti i file grafo dei commit"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"posizione commit non valida. Il grafo dei commit è probabilmente corrotto"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "impossibile trovare il commit %s"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "impossibile recuperare il tipo dell'oggetto %s"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Caricamento commit noti nel grafo dei commit in corso"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "Calcolo numeri generazione del grafo dei commit in corso"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "errore durante l'aggiunta del pack %s"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "errore durante l'apertura dell'indice per %s"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[1] ""
"Ricerca dei commit per il grafo dei commit da %d riferimenti in corso"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Conteggio commit distinti nel grafo dei commit in corso"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
-"il formato del grafo dei commit non può essere usato per scrivere %d commit"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "troppi commit da scrivere nel grafo"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "impossibile creare le prime directory di %s"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossibile creare '%s'"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso"
msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "impossibile aprire il file catena grafo dei commit"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "impossibile ridenominare il file di base grafo dei commit"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Scansione dei commit sottoposti a merge in corso"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "ID commit duplicato inatteso: %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Merge del grafo dei commit in corso"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+"il formato del grafo dei commit non può essere usato per scrivere %d commit"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "troppi commit da scrivere nel grafo"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"il file del grafo dei commit ha un checksum non corretto e probabilmente è "
"corrotto"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "impossibile analizzare il commit %s nel grafo dei commit"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Verifica dei commit nel grafo dei commit in corso"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"impossibile analizzare il commit %s dal database oggetti per il grafo dei "
"commit"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
"l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "il genitore nel grafo dei commit per %s è %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"l'elenco genitori nel grafo dei commit per il commit %s è finito prima del "
"previsto"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"il grafo dei commit ha un numero generazione zero per il commit %s ma non "
"pari a zero per gli altri"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"il grafo dei commit ha un numero generazione non pari a zero per il commit "
"%s ma pari a zero per gli altri"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "memoria esaurita"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"Ciò può essere dovuto a delle inclusioni circolari."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "impossibile espandere il percorso di inclusione '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "le inclusioni configurazione relative devono provenire da file"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
"i condizionali di inclusione configurazione relativi devono provenire da file"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "la chiave non contiene una sezione: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "la chiave non contiene un nome variabile: %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "chiave non valida: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "chiave non valida (nuova riga): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "parametro configurazione fittizio: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "formato fittizio in %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "riga configurazione %d errata nel blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "riga configurazione %d errata nel file %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "riga configurazione %d errata nello standard input"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "riga configurazione %d errata nel blob sottomodulo %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "riga configurazione %d errata nella riga di comando %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "riga configurazione %d errata in %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "fuori intervallo"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "unità non valida"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valore configurazione numerico '%s' errato per '%s': %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "valore configurazione numerico '%s' errato per '%s' nel blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "valore configurazione numerico '%s' errato per '%s' nel file %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valore configurazione numerico '%s' errato per '%s' nello standard input: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valore configurazione numerico '%s' errato per '%s' nel blob sottomodulo %s: "
"%s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valore configurazione numerico '%s' errato per '%s' nella riga di comando "
"%s: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "valore configurazione numerico '%s' errato per '%s' in %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "espansione directory utente in '%s' non riuscita"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' per '%s' non è un timestamp valido"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "lunghezza abbreviazione fuori intervallo: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "livello compressione zlib %d non valido"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar dovrebbe essere composto da un solo carattere"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modalità non valida per la creazione di un oggetto: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "valore malformato per %s"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "valore malformato per %s: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "dev'essere nothing, matching, simple, upstream o current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "livello compressione pack %d non valido"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "impossibile caricare l'oggetto blob configurazione '%s'"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "il riferimento '%s' non punta ad un blob"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossibile risolvere il blob configurazione '%s'"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "analisi di %s non riuscita"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "impossibile analizzare la configurazione a riga di comando"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"si è verificato un errore imprevisto durante la lettura dei file di "
"configurazione"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s non valido: '%s'"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito "
"'keep'"
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e "
"100"
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando"
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d"
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "nome sezione '%s' non valido"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s ha più valori"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "scrittura del nuovo file di configurazione %s non riuscita"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "impossibile bloccare il file di configurazione %s"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "apertura di %s in corso"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "pattern non valido: %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "file di configurazione %s non valido"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat di %s non riuscita"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossibile eseguire mmap su '%s'"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "esecuzione chmod su %s non riuscita"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "impossibile scrivere il file di configurazione %s"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossibile impostare '%s' a '%s'"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "impossibile eliminare l'impostazione di '%s'"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "nome sezione non valido: %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
-msgstr "valore mancante per %s"
+msgstr "valore mancante per '%s'"
#: connect.c:61
msgid "the remote end hung up upon initial contact"
#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
-msgstr "responso ls-refs non valido: %s"
+msgstr "risposta ls-refs non valida: %s"
#: connect.c:445
msgid "expected flush after ref listing"
#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
-msgstr "Risoluzione di %s in corso..."
+msgstr "Risoluzione di %s in corso... "
#: connect.c:639
#, c-format
"Connecting to %s (port %s) ... "
msgstr ""
"fatto.\n"
-"Connessione a %s (porta %s) in corso..."
+"Connessione a %s (porta %s) in corso... "
#: connect.c:665 connect.c:742
#, c-format
msgid "unable to fork"
msgstr "impossibile eseguire fork"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Controllo connessione in corso"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
-msgstr "Non è stato possibile eseguire 'git-rev-list'"
+msgstr "Impossibile eseguire 'git-rev-list'"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "scrittura nella rev-list non riuscita"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "chiusura standard input della rev-list non riuscita"
"l'espressione regolare dell'isola tratta dalla configurazione ha troppi "
"gruppi cattura (massimo=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Contrassegnate %d isole, fatto.\n"
"Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "processo esterno diff morto, mi fermo a %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow richiede esattamente uno specificatore percorso"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "valore non valido per --stat: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s richiede un valore numerico"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s richiede il formato <n>/<m>"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s richiede un carattere, ricevuto '%s'"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argomento --color-moved errato: %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo non valido '%s' in --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
"\" e \"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "argomento non valido per %s"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argomento --word-diff errato: %s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Opzioni formato output diff"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "genera patch"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "non visualizzare l'output del diff"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "genera diff con <n> righe di contesto"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "genera il diff in formato grezzo"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "sinonimo di '-p --raw'"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "sinonimo di '-p --stat'"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "--stat leggibile da una macchina"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "emetti in output solo l'ultima riga di --stat"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<parametro1,parametro2>..."
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"emetti in output la distribuzione del numero di modifiche relativo a ogni "
"sottodirectory"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "sinonimo di --dirstat=cumulative"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "visualizza solo i nomi dei file modificati"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "visualizza solo i nomi e lo stato dei file modificati"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<ampiezza>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "genera il diffstat con un'ampiezza specificata"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "genera il diffstat con un'ampiezza nomi specificata"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "genera il diffstat con un'ampiezza grafo specificata"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<numero>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "genera il diffstat con righe limitate"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "genera riassunto conciso nel diffstat"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "stampa in output un diff binario che può essere applicato"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\""
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "visualizza diff colorato"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
"'nuove' nel diff"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo "
"in --raw o --numstat"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<prefisso>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
-#: diff.c:5357
-#, fuzzy
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
-msgstr "visualizza il prefisso sorgente specificato invece di \"b/\""
+msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "non visualizzare alcun prefisso sorgente o destinazione"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"visualizza il contesto tra gli hunk del diff fino al numero di righe "
"specificato"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<carattere>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "specifica il carattere che indica una nuova riga al posto di '+'"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "specifica il carattere che indica una vecchia riga al posto di '-'"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "specifica il carattere che indica un contesto al posto di ' '"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Opzioni rinominazione diff"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"spezza modifiche di riscrittura completa in coppie eliminazione/creazione"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "rileva le ridenominazioni"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "ometti la preimmagine per le eliminazioni"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "rileva le copie"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "usa file non modificati come sorgente per trovare copie"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "disabilita rilevamento ridenominazione"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "usa blob vuoti come sorgente ridenominazione"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr ""
"continua a elencare la cronologia di un file al di là delle ridenominazioni"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"impedisci il rilevamento ridenominazione/copia se il numero delle "
"destinazioni ridenominazione/copia eccede il limite specificato"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Opzioni algoritmo diff"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "produci il diff più piccolo possibile"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "ignora gli spazi bianchi durante il confronto delle righe"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "ignora le modifiche al numero degli spazi bianchi"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "ignora modifiche agli spazi bianchi a fine riga"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "ignora carattere ritorno a capo a fine riga"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "ignora modifiche che riguardano solo righe vuote"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"euristica per spostare i limiti degli hunk nel diff per una lettura agevole"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"patience diff\""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"histogram diff\""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "seleziona un algoritmo diff"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<testo>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"anchored diff\""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<modalità>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"visualizza il diff parola per parola usando <modalità> per delimitare le "
"parole modificate"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<espressione regolare>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
"equivalente di --word-diff=color --word-diff-regex=<espressione regolare>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "le righe di codice spostate sono colorate in modo diverso"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Altre opzioni diff"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e "
"visualizza i percorsi relativi"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "tratta tutti i file come se fossero di testo"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "scambia i due input, genera un diff al contrario"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "disabilita l'intero output del programma"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "consenti l'esecuzione di un helper diff esterno"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"esegui filtri di conversione in testo esterni quando si confrontano file "
"binari"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<quando>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
-msgstr "specifica come verranno visualizzare le differenze nei sottomoduli"
+msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "nascondi le voci 'git add -N' nell'indice"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "tratta le voci 'git add -N' come reali nell'indice"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<stringa>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"cerca differenze che modificano il numero di occorrenze della stringa "
"specificata"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"cerca differenze che modificano il numero di occorrenze dell'espressione "
"regolare specificata"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "visualizza tutte le modifiche nel changeset con -S o -G"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "controlla l'ordine con cui i file appariranno nell'output"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<ID oggetto>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"cerca differenze che modificano il numero di occorrenze dell'oggetto "
"specificato"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "seleziona file in base al tipo diff"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<file>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Salva l'output in un file specifico"
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"il rilevamento ridenominazione non esatta è stato omesso per la presenza di "
"troppi file."
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"trovate solo copie dai percorsi modificati per la presenza di troppi file."
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc richiede multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "riga shallow non valida: '%s'"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "riga unshallow non valida: '%s'"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "oggetto non trovato: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "errore nell'oggetto: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "nessuno shallow trovato: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "attesi shallow/unshallow, ricevuto %s"
msgid "giving up"
msgstr "smetto di provare"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "fatto"
msgid "error in sideband demultiplexer"
msgstr "errore nel demultiplexer della banda laterale"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Il server non supporta client shallow"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Il server supporta multi_ack_detailes"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Il server supporta no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Il server supporta multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Il server supporta side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Il server supporta side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Il server supporta allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Il server supporta allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Il server supporta ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Il server supporta filter"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "La versione del server è %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Il server supporta %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Il server non supporta client shallow"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Il server non supporta --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Il server non supporta --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Il server non supporta --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "nessun commit in comune"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: recupero non riuscito."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Il server non supporta le richieste shallow"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Il server supporta filter"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "impossibile scrivere la richiesta sul remoto"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "errore durante la lettura dell'intestazione di sezione '%s'"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "atteso '%s', ricevuto '%s'"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "riga di conferma inattesa: '%s'"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "errore durante l'elaborazione degli ack: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "atteso wanted-ref, ricevuto '%s'"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inatteso: '%s'"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "nessun head remoto corrispondente"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "il remoto non ha inviato tutti gli oggetti necessari"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "riferimento remoto non esistente: %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg non è riuscito a firmare i dati"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "impossibile creare il file temporaneo"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "scrittura della firma separata in '%s' non riuscita"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignoro il colore non valido '%.*s' in log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': impossibile leggere %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "stat di '%s' non riuscito"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s': lettura troppo breve"
msgid "These are common Git commands used in various situations:"
msgstr "Questi sono i comandi Git comuni usati in varie situazioni:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "tipo elenco comandi non supportato: '%s'"
#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr ""
-"nessun indirizzo email specificato e rilevamento automatico disabilitato"
+"nessun indirizzo e-mail specificato e rilevamento automatico disabilitato"
#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-"impossibile rilevare automaticamente l'indirizzo email (ho ricavato '%s')"
+"impossibile rilevare automaticamente l'indirizzo e-mail (ho ricavato '%s')"
#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgid "name consists only of disallowed characters: %s"
msgstr "il nome è composto solo da caratteri non consentiti: %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "formato data non valido: %s"
#: list-objects-filter-options.c:84
msgid "sparse:path filters support has been dropped"
-msgstr ""
+msgstr "il supporto per i filtri sparse:percorso è stato rimosso"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "specificatore filtro '%s' non valido"
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgid "failed to read the cache"
msgstr "lettura della cache non riuscita"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "impossibile scrivere il nuovo file index"
msgid "error building trees"
msgstr "errore durante la costruzione degli alberi"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "creazione del percorso '%s' non riuscita%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Rimuovo %s per fare spazio alla sottodirectory\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": forse si tratta di un conflitto D/F?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "mi rifiuto di perdere un file non tracciato in '%s'"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossibile leggere l'oggetto %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "atteso blob per %s '%s'"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "apertura di '%s' non riuscita: %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "creazione del collegamento simbolico '%s' non riuscita: %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "non so che fare con %06o %s '%s'"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Merge del sottomodulo %s non riuscito (i commit non seguono la base del "
"merge)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Eseguo il fast forward del sottomodulo %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Merge del sottomodulo %s non riuscito (non fast forward)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"per accettare questo suggerimento.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Esecuzione del merge interno non riuscita"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossibile aggiungere %s al database"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Merge automatico di %s in corso"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
"%s lasciata nell'albero."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
"%s di %s lasciata nell'albero."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
"%s lasciata nell'albero in %s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
"%s di %s lasciata nell'albero in %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "ridenominazione"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "rinominato"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Mi rifiuto di perdere un file sporco in %s"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s "
"aggiunto in %s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s è una directory in %s; la aggiungo come %s"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s"
"\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (lasciato irrisolto)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. "
"Ridenominato %s->%s in %s"
-#: merge-recursive.c:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"perché la directory %s è stata ridenominata in più directory diverse e "
"nessuna directory di destinazione contiene la maggior parte dei file."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
"posizione i seguenti percorsi: %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
"di spostare in tale posizione i seguenti percorsi: %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
"in %s. Directory ridenominata %s->%s in %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s "
"stesso è stato ridenominato."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "l'oggetto %s non è un blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "modificato"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "contenuto"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "aggiunta/aggiunta"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "sottomodulo"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITTO (%s): conflitto di merge in %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Lo aggiungo come %s"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
"lo sposto in %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
"in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Percorso aggiornato: %s ridenominato in %s in %s in una directory "
"ridenominata in %s; lo sposto in %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
"%s."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "file/directory"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "directory/file"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s "
"come %s"
-#: merge-recursive.c:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Aggiunta %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Già aggiornato!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "merge degli alberi %s e %s non riuscito"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Merge in corso:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "trovato %u antenato comune:"
msgstr[1] "trovati %u antenati comuni:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "il merge non ha restituito alcun commit"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossibile analizzare l'oggetto '%s'"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Impossibile scrivere l'indice."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "il file multi-pack-index %s è troppo piccolo"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versione %d multi-pack-index non riconosciuta"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "la versione dell'hash %u non corrisponde"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "offset blocco non valido (troppo grande)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "dal multi-pack-index manca il blocco richiesto pack-name"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "dal multi-pack-index manca il blocco richiesto fanout OID"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "dal multi-pack-index manca il blocco richiesto lookup OID"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id non valido: %u (%u pack totali)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "errore durante la preparazione del packfile dal multi-pack-index"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "aggiunta del packfile '%s' non riuscita"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "apertura del pack-index '%s' non riuscita"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "non ho visto il file pack %s da scartare"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "pulizia del multi-pack-index %s non riuscita"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Ricerca di file pack referenziati in corso"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Verifica ordine OID in MIDX in corso"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Ordinamento degli oggetti nel packfile in corso"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Verifica offset oggetti in corso"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "caricamento voce pack per oid[%d] = %s non riuscito"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "caricamento pack-index per il packfile %s non riuscito"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "impossibile avviare pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "impossibile finire pack-objects"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "impossibile creare il thread lazy_dir: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "impossibile creare il thread lazy_name: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "impossibile bloccare il thread lazy_name: %s"
msgid "hash mismatch %s"
msgstr "hash non corrispondente: %s"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset collocato prima della fine del packfile (.idx corrotto?)"
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "unable to parse --pretty format"
msgstr "impossibile analizzare il formato --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "impossibile avviare `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "impossibile leggere l'output di `log`"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossibile analizzare il commit '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "impossibile analizzare l'header Git '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "generazione del diff non riuscita"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "impossibile analizzare il registro di '%s'"
msgstr "voci stage non ordinate per '%s'"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "file indice corrotto"
msgid "broken index, expect %s in %s, got %s"
msgstr "indice corrotto, atteso %s in %s, presente %s"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "impossibile chiudere '%s'"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "impossibile eseguire lo stat di '%s'"
msgstr[0] "Rebase di %s su %s (%d comando)"
msgstr[1] "Rebase di %s su %s (%d comandi)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un "
"commit.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Nota che i commit vuoti sono commentati"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "impossibile scrivere '%s'"
"I comportamenti possibili sono ignore, warn, error.\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s non punta a un oggetto valido!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignoro il riferimento simbolico pendente %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignoro il riferimento rotto %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "impossibile aprire '%s' in scrittura: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "impossibile leggere il riferimento '%s'"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "il riferimento '%s' esiste già"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "ID oggetto inatteso durante la scrittura di '%s'"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "impossibile scrivere su '%s'"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossibile aprire '%s' in scrittura"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID oggetto inatteso durante l'eliminazione di '%s'"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "il registro per %s è vuoto"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref per il riferimento '%s' non riuscita: %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' esiste già; impossibile creare '%s'"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
msgid "invalid refspec '%s'"
msgstr "specificatore riferimento '%s' non valido"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "sparito"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "dopo %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "prima di %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "dopo %d, prima di %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato atteso: %%(color:<colore>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "colore non riconosciuto: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Atteso valore intero: refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Atteso valore intero: refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argomento %%(%s) non riconosciuto: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) non accetta argomenti"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argomento %%(objectsize) non riconosciuto: %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) non accetta argomenti"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) non accetta argomenti"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) non accetta argomenti"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argomento %%(trailers) sconosciuto: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "atteso valore positivo in contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argomento %%(contents) non riconosciuto: %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "atteso valore positivo in objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argomento %%(objectname) non riconosciuto: %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "valore non riconosciuto: position:%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "valore non riconosciuto: width:%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argomento %%(align) non riconosciuto: %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "attesa ampiezza positiva con l'atom %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argomento %%(if) non riconosciuto: %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "nome campo malformato: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome campo sconosciuto: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
"non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati "
"oggetto"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: atomo %%(if) usato senza un atomo %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: atomo %%(then) usato senza un atomo %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: atomo %%(then) usato più di una volta"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: atomo %%(then) usato dopo %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: atomo %%(else) usato senza un atomo %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: atomo %%(else) usato senza un atomo %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: atomo %%(else) usato più di una volta"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "stringa di formato %s malformata"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(nessun branch, eseguo il rebase di %s)"
-
-#: ref-filter.c:1456
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(nessun branch, eseguo il rebase dell'HEAD scollegato %s)"
+msgid "no branch, rebasing %s"
+msgstr "nessun branch, eseguo il rebase di %s"
-#: ref-filter.c:1459
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(nessun branch, bisezione avviata su %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD scollegato su %s)"
-
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD scollegato da %s)"
+msgid "no branch, bisect started on %s"
+msgstr "nessun branch, bisezione avviata su %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(nessun branch)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "nessun branch"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "oggetto %s mancante per %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer non riuscito su %s per %s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "oggetto malformato in '%s'"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignoro il riferimento con il nome malformato %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: atomo %%(end) mancante"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "l'opzione `%s' non è compatibile con --merged"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "l'opzione `%s' non è compatibile con --no-merged"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "nome dell'oggetto %s malformato"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opzione `%s' deve puntare ad un commit"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
-"Il tuo branch è indietro rispetto a '%s' di %d commit e ne posso eseguire il "
-"fast forward.\n"
+"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
+"il fast forward.\n"
msgstr[1] ""
-"Il tuo branch è indietro rispetto a '%s' di %d commit e ne posso eseguire il "
-"fast forward.\n"
+"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
+"il fast forward.\n"
#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgid "Recorded preimage for '%s'"
msgstr "Salvata preimmagine di '%s'"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "impossibile creare la directory '%s'"
msgid "unable to open rr-cache directory"
msgstr "impossibile aprire la directory cache rr"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "sembra che il tuo branch corrente sia rotto"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "il tuo branch corrente '%s' non ha ancora commit"
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent non è compatibile con --bisect"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L non supporta ancora formati diff oltre a -p e -s"
msgid "could not delete '%s'"
msgstr "impossibile eliminare '%s'"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossibile rimuovere '%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "revert"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "azione sconosciuta: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
"con 'git add <path>' o 'git rm <path>'"
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"con 'git add <path>' o 'git rm <path>' ed esegui\n"
"il commit del risultato con 'git commit'"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "impossibile bloccare '%s'"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossibile scrivere il carattere di fine riga in '%s'"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "finalizzazione di '%s' non riuscita"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "impossibile leggere '%s'"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "le tue modifiche locali sarebbero sovrascritte da %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "esegui il commit delle modifiche o lo stash per procedere."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: fast forward"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modalità pulizia non valida: %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: impossibile scrivere il nuovo file indice"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "impossibile aggiornare l'albero cache"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "impossibile risolvere il commit HEAD"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "nessuna chiave presente in '%.*s'"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "impossibile rimuovere gli apici dal valore di '%s'"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossibile aprire '%s' in lettura"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' già specificato"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' già specificato"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' già specificato"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "variabile '%s' sconosciuta"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' mancante"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' mancante"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' mancante"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "formato data '%s' non valido in '%s'"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "scrittura commit radice in corso"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' non riuscito"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"Il tuo nome e l'indirizzo email sono stati configurati "
-"automaticamenteusando\n"
+"Il tuo nome e l'indirizzo e-mail sono stati configurati automaticamente "
+"usando\n"
"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n"
"È possibile eliminare questo messaggio impostandoli esplicitamente.\n"
"Esegui il seguente comando e segui le istruzioni fornite nel tuo editor\n"
"per modificare il file di configurazione:\n"
"\n"
" git config --global --edit\n"
-"Dopo questa operazione, puoi ripristinare l'identità usata in questo "
-"commitcon:\n"
+"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit "
+"con:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"Il tuo nome e l'indirizzo email sono stati configurati "
-"automaticamenteusando\n"
+"Il tuo nome e l'indirizzo e-mail sono stati configurati automaticamente "
+"usando\n"
"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n"
"È possibile eliminare questo messaggio impostandoli esplicitamente:\n"
"\n"
" git config --global user.name \"Il tuo nome\"\n"
" git config --global user.email tu@esempio.com\n"
"\n"
-"Dopo questa operazione, puoi ripristinare l'identità usata in questo "
-"commitcon:\n"
+"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit "
+"con:\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "impossibile trovare il commit appena creato"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "impossibile analizzare il commit appena creato"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "impossibile risolvere HEAD dopo la creazione del commit"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "HEAD scollegato"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (commit radice)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "impossibile analizzare HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "L'HEAD %s non è un commit!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "impossibile analizzare il commit HEAD"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "impossibile analizzare l'autore del commit"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree non è riuscito a scrivere un albero"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossibile leggere il messaggio di commit da '%s'"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "scrittura dell'oggetto del commit non riuscita"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "impossibile analizzare il commit %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossibile analizzare il commit genitore %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "comando sconosciuto: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Questa è una combinazione di %d commit."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "è necessaria un'HEAD per il fixup"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "impossibile leggere il messaggio di commit dell'HEAD"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "impossibile scrivere '%s'"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Questo è il primo messaggio di commit:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "impossibile leggere il messaggio di commit di %s"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Questo è il messaggio di commit numero %d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Il messaggio di commit numero %d sarà saltato:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "il file indice non è stato sottoposto a merge."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "impossibile eseguire il fixup sul commit radice"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m."
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "il commit %s non ha il genitore %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossibile ottenere il messaggio di commit per %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: impossibile analizzare il commit genitore %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossibile ridenominare '%s' in '%s'"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "non è stato possibile eseguire il revert di %s... %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "non è stato possibile applicare %s... %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: lettura dell'indice non riuscita"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: aggiornamento dell'indice non riuscito"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s non accetta argomenti: '%s'"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "argomenti mancanti per %s"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "impossibile analizzare '%.*s'"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "riga %d non valida: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "impossibile eseguire '%s' senza un commit precedente"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "impossibile leggere '%s'."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "annullo un'operazione di cherry-pick in corso"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "annullo un'operazione di revert in corso"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "correggi la situazione usando 'git rebase --edit-todo'."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "foglio istruzioni inutilizzabile: '%s'"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "nessun commit analizzato."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "impossibile eseguire un cherry-pick durante un revert."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "impossibile eseguire un revert durante un cherry-pick."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "valore non valido per %s: %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "squash-onto inutilizzabile"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "foglio opzioni malformati: '%s'"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "è stato passato un insieme di commit vuoto"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "è già in corso un'operazione di cherry-pick o di revert"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "un'operazione di revert è già in corso"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "un'operazione di cherry-pick è già in corso"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\""
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossibile creare la directory sequencer '%s'"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "impossibile bloccare HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "nessuna operazione di cherry-pick o revert in corso"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "impossibile risolvere HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr ""
"impossibile interrompere l'operazione da un branch che deve essere ancora "
"creato"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "impossibile aprire '%s'"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossibile leggere '%s': %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "fine del file inattesa"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!"
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "nessun revert in corso"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "nessun cherry-pick in corso"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "salto del commit non riuscito"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "non c'è nulla da saltare"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"hai già eseguito il commit?\n"
+"prova \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "impossibile aggiornare %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossibile applicare %s... %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossibile eseguire il merge di %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "impossibile leggere l'indice"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nome etichetta illecito: '%.*s'"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "scrittura commit radice falso in corso"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "scrittura squash-onto in corso"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "impossibile trovare l'albero di %s"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "impossibile scrivere l'indice"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "impossibile eseguire il merge senza una revisione corrente"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossibile analizzare '%.*s'"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "non c'è nulla di cui eseguire il merge: '%.*s'"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossibile ottenere il messaggio di commit per '%s'"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "merge: impossibile scrivere il nuovo file indice"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Stash automatico applicato.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "impossibile memorizzare %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Le tue modifiche sono al sicuro nello stash.\n"
"Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "impossibile eseguire il checkout di %s"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: non è un OID valido"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "impossibile scollegare l'HEAD"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Fermato a HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Fermato a %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Fermato a %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "comando %d sconosciuto"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "impossibile leggere orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "impossibile leggere 'onto'"
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossibile aggiornare l'HEAD a %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"impossibile eseguire il rebase: ci sono delle modifiche non in staging."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "impossibile modificare un commit inesistente"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "file non valido: '%s'"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenuti non validi: '%s'"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
"--continue'."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "impossibile scrivere il file: '%s'"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "impossibile eseguire il commit delle modifiche in staging."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: impossibile eseguire il cherry pick di un %s"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisione non valida"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "impossibile eseguire il revert come commit iniziale"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: opzioni non gestite"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: errore durante la preparazione delle revisioni"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"eseguire 'git rebase --continue'.\n"
"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "nulla da fare"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "impossibile saltare i comandi pick non necessari"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "lo script è già stato riordinato."
msgid "reference repository '%s' is grafted"
msgstr "il repository di riferimento '%s' è un graft"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap non riuscita"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "l'oggetto %s è vuoto"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "oggetto sciolto '%s' corrotto"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "tipo oggetto non valido"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "impossibile decomprimere l'intestazione %s"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "impossibile analizzare l'intestazione %s"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "lettura dell'oggetto %s non riuscita"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s sostitutivo non trovato per %s"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "impossibile scrivere il file %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossibile impostare i permessi a '%s'"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "errore di scrittura del file"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "errore durante la chiusura del file oggetto sciolto"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"permessi non sufficienti per l'aggiunta di un oggetto al database repository "
"%s"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "impossibile creare il file temporaneo"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "impossibile scrivere il file oggetto sciolto"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "sono confuso dall'origine dati oggetto non stabile per %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "utime() di %s non riuscita"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "impossibile leggere l'oggetto per %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "commit corrotto"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "tag corrotto"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "errore di lettura durante l'indicizzazione di %s"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "lettura troppo breve durante l'indicizzazione di %s"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: inserimento del record nel database non riuscito"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo di file non supportato"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s non è un oggetto valido"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s non è un oggetto '%s' valido"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossibile aprire %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mancata corrispondenza per %s (atteso %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "impossibile eseguire mmap su %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossibile decomprimere l'intestazione di %s"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "impossibile analizzare l'intestazione di %s"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossibile decomprimere i contenuti di %s"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"semplicemente 40 caratteri esadecimali. Questi riferimenti\n"
"potrebbero essere creati per errore. Ad esempio:\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"dove \"$br\" è vuoto per qualche motivo e quindi viene creato un\n"
"riferimento con 40 caratteri esadecimali. Esamina tali\n"
"riferimenti ed eliminali se necessario. Disabilita questo\n"
"messaggio eseguendo \"git config advice.objectNameWarning false\""
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u byte"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u byte/s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Impossibile risolvere HEAD come riferimento valido."
msgid "Submodule '%s' could not be updated."
msgstr "Impossibile aggiornare il sottomodulo '%s'."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir non è supportata per il sottomodulo '%s' con più di un "
"albero di lavoro"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossibile ricercare il nome per il sottomodulo '%s'"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' a\n"
"'%s'\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "impossibile avviare ls-files in .."
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha restituito il valore di ritorno inatteso %d"
msgid "failed to push all needed submodules"
msgstr "push di tutti i sottomoduli richiesti non riuscito"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "operazione non supportata dal protocollo"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "scrittura completa verso l'helper remoto non riuscita"
msgid "error while running fast-import"
msgstr "errore durante l'esecuzione di fast-import"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "impossibile leggere il riferimento %s"
msgid "helper %s does not support 'push-option'"
msgstr "l'helper %s non supporta 'push-option'"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
"l'helper remoto non supporta il push; è necessario uno specificatore "
"riferimento"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "l'helper %s non supporta 'force'"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "impossibile eseguire fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "errore durante l'esecuzione di fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
"Forse dovresti specificare un branch come 'master'.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "risposta malformata nell'elenco riferimenti: %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) non riuscita"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) non riuscita"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "thread %s non riuscito"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "join non riuscita per il thread %s: %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "impossibile avviare il thread per la copia dei dati: %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "wait non riuscita per il processo %s"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "processo %s non riuscito"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "impossibile avviare il thread per la copia dei dati"
msgid "empty filename in tree entry"
msgstr "nome file vuoto nella voce dell'albero"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "file alber troppo corto"
"%%sPlease move or remove them before you merge."
msgstr ""
"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
-"eliminati con il merge:\n"
+"eliminati dal merge:\n"
"%%sSpostali o eliminali prima di eseguire il merge."
#: unpack-trees.c:139
"%%s"
msgstr ""
"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
-"eliminati con il merge:\n"
+"eliminati dal merge:\n"
"%%s"
#: unpack-trees.c:142
"%%sPlease move or remove them before you merge."
msgstr ""
"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
-"sovrascritti con il merge:\n"
+"sovrascritti dal merge:\n"
"%%sSpostali o eliminali prima di eseguire il merge."
#: unpack-trees.c:157
"%%s"
msgstr ""
"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
-"sovrascritti con il merge:\n"
+"sovrascritti dal merge:\n"
"%%s"
#: unpack-trees.c:160
msgstr "Interrompo l'operazione\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Checkout dei file in corso"
+msgid "Updating files"
+msgstr "Aggiornamento dei file in corso"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "parte percorso '..' non valida"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "lettura di '%s' non riuscita"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' nell'albero di lavoro principale non è la directory del repository"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"il file '%s' non contiene il percorso assoluto alla posizione dell'albero di "
"lavoro"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' non esiste"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' non è un file .git, codice d'errore %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' non punta a '%s'"
msgid "unable to get current working directory"
msgstr "impossibile ottenere la directory di lavoro corrente"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Percorsi non sottoposti a merge:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+" (usa \"git restore --staged <file>...\" per rimuovere gli elementi "
+"dall'area di staging)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
-" (usa \"git reset %s <file>...\" per rimuovere gli elementi dall'area di "
-"staging)"
+" (usa \"git restore --source=%s --staged <file>...\" per rimuovere gli "
+"elementi dall'area di staging)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (usa \"git rm --cached <file>...\" per rimuovere gli elementi dall'area di "
"staging)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (usa \"git add <file>...\" per contrassegnare il conflitto come risolto)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (usa \"git add/rm <file>...\" come appropriato per contrassegnare il "
"conflitto come risolto)"
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (usa \"git rm <file>...\" per contrassegnare il conflitto come risolto)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Modifiche di cui verrà eseguito il commit:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Modifiche non nell'area di staging per il commit:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add <file>...\" per aggiornare gli elementi di cui sarà "
"eseguito il commit)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (usa \"git add/rm <file>...\" per aggiornare gli elementi di cui sarà "
"eseguito il commit)"
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (usa \"git checkout -- <file>...\" per scartare le modifiche nella "
-"directory di lavoro)"
+" (usa \"git restore <file>...\" per scartare le modifiche nella directory "
+"di lavoro)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (esegui il commit o scarta il contenuto non tracciato o modificato nei "
"sottomoduli)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (usa \"git %s <file>...\" per includere l'elemento fra quelli di cui verrà "
"eseguito il commit)"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "entrambi eliminati:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "aggiunto da noi:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "eliminato da loro:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "aggiunto da loro:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "eliminato da noi:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "entrambi aggiunti:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "entrambi modificati:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "nuovo file:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "copiato:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "eliminato:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "modificato:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "rinominato:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "modifica tipo:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "sconosciuto:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "non sottoposto a merge:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "nuovi commit, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "contenuto modificato, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "contenuto non tracciato, "
-#: wt-status.c:896
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Lo stash attualmente ha %d voce"
msgstr[1] "Lo stash attualmente ha %d voci"
-#: wt-status.c:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Sottomoduli modificati ma non aggiornati:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Modifiche ai sottomoduli di cui verrà eseguito il commit:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Non modificare o rimuovere la riga soprastante.\n"
"Tutto ciò che si trova al di sotto di essa sarà ignorato."
-#: wt-status.c:1119
-msgid "You have unmerged paths."
-msgstr "Hai dei percorsi non sottoposti a merge."
-
-#: wt-status.c:1122
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (risolvi i conflitti ed esegui \"git commit\")"
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Sono stati necessari %.2f secondi per calcolare il numero di commit\n"
+"precedenti/successivi nel branch.\n"
+"Puoi usare '--no-ahead-behind' per evitare il calcolo.\n"
+
+#: wt-status.c:1144
+msgid "You have unmerged paths."
+msgstr "Hai dei percorsi non sottoposti a merge."
-#: wt-status.c:1124
+#: wt-status.c:1147
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (risolvi i conflitti ed esegui \"git commit\")"
+
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (usa \"git merge --abort\" per interrompere il merge)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tutti i conflitti sono stati risolti ma il merge è ancora in corso."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" per terminare il merge)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Sei nel bel mezzo di una sessione am."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "La patch corrente è vuota."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (risolvi i conflitti e quindi esegui \"git am --continue\")"
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (usa \"git am --skip\" per saltare questa patch)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" per ripristinare il branch originario)"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo è mancante."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Nessun comando eseguito."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Ultimo comando eseguito (%d comando eseguito):"
msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):"
-#: wt-status.c:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (vedi di più nel file %s)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Nessun comando rimanente."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prossimo comando da eseguire (%d comando rimanente):"
msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):"
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (usa \"git rebase --edit-todo\" per visualizzare e modificare le "
"operazioni)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Attualmente stai eseguendo il rebase del branch '%s' su '%s'."
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Attualmente stai eseguendo un rebase."
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (risolvi i conflitti e quindi esegui \"git rebase --continue\")"
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" per saltare questa patch)"
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (usa \"git rebase --abort\" per eseguire il checkout del branch originario)"
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (tutti i conflitti sono stati risolti: esegui \"git rebase --continue\")"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Attualmente stai dividendo un commit durante il rebase del branch '%s' su "
"'%s'."
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Attualmente stai dividendo un commit durante un rebase."
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una volta che la tua directory di lavoro è pulita, esegui \"git rebase --"
"continue\")"
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Attualmente stai modificando un commit durante il rebase del branch '%s' su "
"'%s'."
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Attualmente stai modificando un commit durante un rebase."
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" per correggere il commit corrente)"
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (usa \"git rebase --continue\" una volta soddisfatto delle tue modifiche)"
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick in corso."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Attualmente stai eseguendo il cherry-pick del commit %s."
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (risolvi i conflitti ed esegui \"git cherry-pick --continue\")"
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (esegui \"git cherry-pick --continue\" per continuare)"
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tutti i conflitti sono stati risolti: esegui \"git cherry-pick --continue"
"\")"
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)"
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revert in corso."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Attualmente stai eseguendo il revert del commit %s."
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")"
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (esegui \"git revert --continue\" per continuare)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'."
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Attualmente stai eseguendo una bisezione."
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" per tornare al branch originario)"
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "Sul branch "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebase interattivo in corso su "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebase in corso su "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD scollegato su "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD scollegato da "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Attualmente non sei su alcun branch."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Commit iniziale"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Non ci sono ancora commit"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "File non tracciati"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "File ignorati"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"ma devi stare attento a non dimenticarti di aggiungere\n"
"autonomamente i file nuovi (vedi 'git help status')."
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "File non tracciati non elencati%s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (usa l'opzione -u per visualizzare i file non tracciati)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Nessuna modifica"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n"
-#: wt-status.c:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "nessuna modifica aggiunta al commit\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"non è stato aggiunto nulla al commit ma sono presenti file non tracciati "
"(usa \"git add\" per tracciarli)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n"
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add"
"\" per tracciarli)\n"
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "non c'è nulla di cui eseguire il commit\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non "
"tracciati)\n"
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Non ci sono ancora commit su"
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (nessun branch)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "differente"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "indietro "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "avanti "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging."
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
msgid "unexpected diff status %c"
msgstr "stato diff inatteso %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "aggiornamento dei file non riuscito"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "test controllato"
msgid "interactive picking"
msgstr "scelta interattiva"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "seleziona gli hunk in modalità interattiva"
msgid "Patch format detection failed."
msgstr "Rilevamento del formato della patch non riuscito."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "creazione della directory '%s' non riuscita"
msgid "Failed to split patches."
msgstr "Divisione delle patch non riuscita."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "impossibile scrivere il file indice"
msgid "unable to parse commit %s"
msgstr "impossibile analizzare il commit %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Dal repository mancano i blob necessari per ripiegare sul merge a tre vie."
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilizzo le informazioni dell'indice per ricostruire un albero di base..."
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Hai modificato manualmente la patch?\n"
"Non può essere applicata ai blob registrati nel suo indice."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Ripiego sul patching della base e sul merge a tre vie..."
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Merge delle modifiche non riuscito."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "applicazione a una cronologia vuota"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossibile riprendere l'attività: %s non esiste."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"impossibile eseguire l'attività in modalità interattiva con lo standard "
-"input non collegato a un terminale."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Il corpo del commit è:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:"
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Applicazione in corso: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Nessuna modifica -- patch già applicata."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch non riuscita a %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n"
"ha già introdotto le stesse modifiche; potresti voler saltare questa patch."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Potresti eseguire `git rm` su un file per accettarne la risoluzione "
"\"eliminato da loro\"."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossibile analizzare l'oggetto '%s'."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "pulizia dell'indice non riuscita"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"'am'.\n"
"Non ritorno indietro a ORIG_HEAD"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valore non valido per --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "esegui in modalità interattiva"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "opzione storica -- non esegue nulla"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "consenti il ripiego sul merge a tre vie se necessario"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "non visualizzare messaggi"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "aggiungi una riga Signed-off-by al messaggio di commit"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "converti codifica in UTF-8 (impostazione predefinita)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "fornisci l'argomento -k a git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "fornisci l'argomento -b a git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "fornisci l'argomento -m a git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal "
"valore di am.keepcr"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\""
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "passa l'argomento a git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "il formato delle patch"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr ""
"esegui l'override del messaggio d'errore quando si verifica un errore legato "
"alle patch"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr ""
"continua l'applicazione delle patch dopo la risoluzione di un conflitto"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "sinonimi di --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "salta la patch corrente"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "ripristina il branch originario e interrompi l'operazione di patching."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "visualizza la patch in fase di applicazione."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "menti sulla data del commit"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "usa il timestamp corrente come data autore"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "ID chiave"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "firma i commit con GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(a uso interno per git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"L'opzione -b/--binary non esegue nulla da molto tempo e\n"
"sarà rimossa. Non usarla più."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "lettura dell'indice non riuscita"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"la directory di rebase precedente %s esiste ancora ma è stata specificata "
"un'mbox."
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Trovata directory smarrita %s.\n"
"Usa \"git am --abort\" per eliminarla."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operazione di risoluzione non in corso, non riprendiamo."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+"la modalità interattiva richiede che le patch siano fornite sulla riga di "
+"comando"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<opzioni>] [<patch>...]"
msgid "bad HEAD - strange symbolic ref"
msgstr "head non valida - riferimento simbolico strano"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "riferimento non valido: '%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "esegui 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "scrivi i termini in .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "pulisci lo stato bisezione"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "controlla se le revisioni attese sono presenti"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "reimposta lo stato della bisezione"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "scrivi lo stato della bisezione in BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "controlla e imposta i termini in uno stato bisezione"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr ""
"controlla se esistono termini per revisioni non funzionanti o funzionanti"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "stampa i termini della bisezione"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "inizia la sessione di bisezione"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "non registrare le operazioni eseguite per BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms richiede due argomenti"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state non richiede argomenti"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset richiede o nessun argomento o un commit"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write richiede o quattro o cinque argomenti"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms richiede tre argomenti"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check richiede due o tre argomenti"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms richiede zero o un argomento"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "atteso colore: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "deve terminare con un colore"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "colore '%s' non valido in color.blame.repeatedLines"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valore non valido per blame.coloring"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "impossibile trovare la revisione %s da ignorare"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Visualizza le voci blame incrementalmente, a mano a mano che le troviamo"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Visualizza un hash SHA-1 vuoto per i commit limite (impostazione "
"predefinita: off)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Non gestire i commit radice come commit limite (impostazione predefinita: "
"off)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Visualizza le statistiche sul costo dell'operazione"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Forza l'indicazione d'avanzamento dell'operazione"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Visualizza il punteggio di output per le voci blame"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr ""
"Visualizza il nome file originario (impostazione predefinita: automatico)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr ""
"Visualizza il numero di riga originario (impostazione predefinita: off)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr ""
"Visualizza l'output in un formato progettato per l'utilizzo da parte di una "
"macchina"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr ""
"Visualizza il formato porcelain con le informazioni sul commit per ogni riga"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa la stessa modalità di output di git-annotate (impostazione predefinita: "
"off)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
"Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: "
"off)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
"Non visualizzare il nome autore e il timestamp (impostazione predefinita: "
"off)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr ""
-"Visualizza l'indirizzo email dell'autore invece del nome (impostazione "
+"Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione "
"predefinita: off)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignora le differenze relative agli spazi bianchi"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "revisione"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "Ignora <revisione> durante l'esecuzione del blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Ignora le revisioni specificate in <file>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "colora in modo differente i metadati ridondanti della riga precedente"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "colora le righe in base all'età"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Usa un'euristica sperimentale per migliorare i diff"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Usa cicli extra per trovare una corrispondenza migliore"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Usa i contenuti di <file> come immagine finale"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "punteggio"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Trova copie delle righe all'interno e fra file"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Trova righe spostate all'interno e fra file"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Elabora solo l'intervallo righe n,m, contandole da 1"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress non può essere usato con --incremental o con i formati porcelain"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 anni, 11 giorni fa"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "il file %s ha solo %lu riga"
msgstr[1] "il file %s ha solo %lu righe"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Eseguo il blame sulle righe"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opzioni>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"elimino il branch '%s' di cui è stato eseguito il merge in\n"
" '%s', ma di cui non è ancora stato eseguito il merge in HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"non elimino il branch '%s' di cui non è ancora stato eseguito il merge in\n"
" '%s', benché ne sia stato eseguito il merge in HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossibile trovare l'oggetto commit per '%s'"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Il branch '%s' non è stato sottoposto completamente a un merge.\n"
"Se sei sicuro di volerlo eliminare, esegui 'git branch -D %s'."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Aggiornamento del file di configurazione non riuscito"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "impossibile usare -a con -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossibile trovare l'oggetto commit per HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
"Impossibile eliminare il branch '%s' di cui è stato eseguito il checkout in "
"'%s'"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branch remoto tracciato '%s' non trovato."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "branch '%s' non trovato."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Errore durante l'eliminazione del branch remoto tracciato '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Errore durante l'eliminazione del branch '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "Eliminato branch remoto tracciato %s (era %s).\n"
+msgstr "Branch remoto tracciato %s eliminato (era %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
-msgstr "Eliminato branch %s (era %s).\n"
+msgstr "Branch %s eliminato (era %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "impossibile analizzare la stringa di formato"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "impossibile risolvere HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) punta a un oggetto non in refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rebase del branch %s in corso in %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Bisezione del branch %s in corso in %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr ""
"impossibile copiare il branch corrente quando non si è su alcun branch."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
-"impossibile rinominare il branch corrente quando non si è su alcun branch."
+"impossibile ridenominare il branch corrente quando non si è su alcun branch."
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nome branch non valido: '%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Ridenominazione del branch non riuscita"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Copia del branch non riuscita"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Creata copia del branch mal denominato '%s'"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Branch mal denominato '%s' rinominato"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch rinominato in %s, ma HEAD non è aggiornato!"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Il branch è stato rinominato, ma l'aggiornamento del file di configurazione "
"non è riuscito"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Il branch è stato copiato, ma l'aggiornamento del file di configurazione non "
"è riuscito"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Le righe che iniziano con '%c' saranno omesse.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Opzioni generiche"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"visualizza l'hash e l'oggetto, usa l'opzione due volte per il branch upstream"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "non visualizzare i messaggi informativi"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "imposta la modalità tracking (vedi git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "non usare"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "modifica le informazioni sull'upstream"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Rimuovi le informazioni sull'upstream"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "usa l'output colorato"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "agisci sui branch remoti tracciati"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "stampa solo i branch che contengono i commit"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "stampa solo i branch che non contengono i commit"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Azioni specifiche di git-branch:"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "elenca sia i branch remoti tracciati sia quelli locali"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "elimina il branch completamente sottoposto a merge"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "elimina il branch (anche se non è stato sottoposto a merge)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "sposta/rinomina un branch e il suo registro dei riferimenti"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "sposta/rinomina un branch anche se la destinazione esiste"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "copia un branch e il suo registro dei riferimenti"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "copia un branch anche se la destinazione esiste"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "elenca i nomi dei branch"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "visualizza il nome del branch corrente"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "crea il registro dei riferimenti del branch"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "modifica la descrizione del branch"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "forza la creazione, spostamento/ridenominazione, eliminazione"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "stampa solo i branch sottoposti a merge"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "stampa solo i branch non sottoposti a merge"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "elenca i branch in colonne"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "oggetto"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "stampa solo i branch dell'oggetto"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr ""
"l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato da usare per l'output"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trovato fra i riferimenti/head!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column e --verbose non sono compatibili"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "nome branch richiesto"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Impossibile fornire una descrizione per l'HEAD scollegato"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "impossibile modificare la descrizione per più di un branch"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Non esiste ancora nessun commit sul branch '%s'."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Non esiste alcun branch denominato '%s'."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "sono presenti troppi branch per consentire un'operazione di copia"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr ""
"sono presenti troppi argomenti per consentire un'operazione di "
"ridenominazione"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr ""
"sono presenti troppi argomenti per consentire l'impostazione del nuovo "
"upstream"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"impossibile impostare l'upstream di HEAD a %s quando non punta ad alcun "
"branch."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "branch '%s' non esistente"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "il branch '%s' non esiste"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr ""
"sono presenti troppi argomenti per rimuovere le informazioni sull'upstream"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossibile rimuovere le informazioni sull'upstream di HEAD quando non punta "
"ad alcun branch."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Il branch '%s' non ha informazioni sull'upstream"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"le opzioni -a e -r per 'git branch' non hanno senso con il nome di un branch"
+"Le opzioni di 'git branch' -a e -r non richiedono un nome branch.\n"
+"Forse volevi usare: -a|-r --list <pattern>?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Per decomprimere un bundle è necessario un repository."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "può essere specificata solo un'opzione batch"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> può essere uno fra blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "visualizza tipo oggetto"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "visualizza dimensioni oggetto"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "esci con codice d'uscita zero se non si sono verificati errori"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "stampa il contenuto dell'oggetto con un formato leggibile"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "usa un percorso specifico per --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "esegui il buffering dell'output di --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"visualizza le informazioni e il contenuto degli oggetti forniti nello "
"standard input"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "visualizza le informazioni degli oggetti forniti nello standard input"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-"
"check)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "visualizza tutti gli oggetti con --batch o --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "non ordinare l'output di --batch-all-objects"
msgid "terminate input and output records by a NUL character"
msgstr "termina i record di input e output con un carattere NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "non visualizzare l'avanzamento dell'operazione"
msgstr "scrivi il contenuto in file temporanei"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "stringa"
msgid "copy out the files from named stage"
msgstr "copia i file dalla fase specificata"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<opzioni>] <branch>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<opzioni>] [<branch>] -- <file>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opzioni>] <branch>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opzioni>] [--source=<branch>] <file>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "il percorso '%s' non ha la nostra versione"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "il percorso '%s' non ha la loro versione"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "il percorso '%s' non ha tutte le versioni necessarie"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "il percorso '%s' non ha le versioni necessarie"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "percorso '%s': impossibile eseguire il merge"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossibile aggiungere il risultato del merge per '%s'"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Ricreato %d conflitto di merge"
+msgstr[1] "Ricreati %d conflitti di merge"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Aggiornato %d percorso da %s"
+msgstr[1] "Aggiornati %d percorsi da %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Aggiornato %d percorso dall'indice"
+msgstr[1] "Aggiornati %d percorsi dall'indice"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' non può essere usato con %s"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossibile aggiornare dei percorsi e passare al branch '%s' "
"contemporaneamente."
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "il percorso '%s' non è stato sottoposto a merge"
+msgid "neither '%s' or '%s' is specified"
+msgstr "né '%s' né '%s' sono stati specificati"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Ricreato %d conflitto di merge"
-msgstr[1] "Ricreati %d conflitti di merge"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' dev'essere usato quando '%s' non è specificato"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "Aggiornato %d percorso da %s"
-msgstr[1] "Aggiornati %d percorsi da %s"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' o '%s' non possono essere usati con %s"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "Aggiornato %d percorso dall'indice"
-msgstr[1] "Aggiornati %d percorsi dall'indice"
+msgid "path '%s' is unmerged"
+msgstr "il percorso '%s' non è stato sottoposto a merge"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "prima devi risolvere l'indice corrente"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"impossibile continuare con modifiche in stage nei file seguenti:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD si trova ora a"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "impossibile aggiornare HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ripristina il branch '%s'\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Si è già su '%s'\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Si è passati al branch '%s' e lo si è reimpostato\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Si è passati a un nuovo branch '%s'\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Si è passati al branch '%s'\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ...e altri %d.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nome del nuovo branch> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "errore interno durante la visita delle revisioni"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "La precedente posizione di HEAD era"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Sei su un branch che deve ancora essere creato"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "atteso solo un riferimento"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "atteso solo un riferimento, %d specificati."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n"
"Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "riferimento non valido: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "il riferimento non è un albero: %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "atteso branch, ricevuto tag '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "atteso branch, ricevuto branch remoto '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "atteso branch, ricevuto '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "atteso branch, ricevuto commit '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un merge\n"
+"Considera l'uso di \"git merge --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch nel bel mezzo di una sessione am\n"
+"Considera l'uso di \"git am --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un rebase\n"
+"Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un cherry-pick\n"
+"Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"impossibile cambiare branch durante un revert\n"
+"Considera l'uso di \"git revert --quit\" o di \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "stai cambiando branch durante una bisezione"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "i percorsi non possono essere usati passando da un branch a un altro"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' non può essere usato passando da un branch a un altro"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' non può essere usato con '%s'"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' non accetta l'argomento <punto di partenza>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "branch"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "argomento branch o commit mancante"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "crea un nuovo branch ed eseguine il checkout"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "forza l'indicazione d'avanzamento dell'operazione"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "crea/reimposta un branch ed eseguine il checkout"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "esegui un merge a tre vie con il nuovo branch"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "crea il registro dei riferimenti per il nuovo branch"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "stile"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "stile conflitti (merge o diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "scollega l'HEAD al commit specificato"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "imposta le informazioni sull'upstream per il nuovo branch"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "nuovo branch"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "nuovo branch senza genitore"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "aggiorna i file ignorati (impostazione predefinita)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"non controllare se un altro albero di lavoro contiene il riferimento "
+"specificato"
+
+#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr ""
"esegui il checkout della nostra versione per i file non sottoposti a merge"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr ""
"esegui il checkout della loro versione per i file non sottoposti a merge"
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "esegui un merge a tre vie con il nuovo branch"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "aggiorna i file ignorati (impostazione predefinita)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "stile"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "stile conflitti (merge o diff3)"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "non limitare gli specificatori percorso solo alle voci sparse"
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "non indovinare 'git checkout <branch inesistente>'"
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-"non controllare se un altro albero di lavoro contiene il riferimento "
-"specificato"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forza l'indicazione d'avanzamento dell'operazione"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "usa modalità overlay (impostazione predefinita)"
-
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track richiede il nome di un branch"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "nome del branch mancante; prova con -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "impossibile risolvere %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "devi specificare il percorso/i percorsi da ripristinare"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "specificatore percorso non valido"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' non è un commit e non si può creare un branch '%s' che parta da esso"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach non accetta un percorso '%s' come argomento"
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
"si esegue il checkout dell'indice."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
-#: builtin/clean.c:28
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
-"<percorsi>..."
-
-#: builtin/clean.c:32
-#, c-format
-msgid "Removing %s\n"
-msgstr "Eliminazione di %s in corso\n"
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "branch"
-#: builtin/clean.c:33
-#, c-format
-msgid "Would remove %s\n"
-msgstr "Eliminerei %s\n"
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "crea un nuovo branch ed eseguine il checkout"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "crea/reimposta un branch ed eseguine il checkout"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "crea il registro dei riferimenti per il nuovo branch"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "usa modalità overlay (impostazione predefinita)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "crea un nuovo branch e passa a quest'ultimo"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "crea/reimposta un branch e passa a quest'ultimo"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "prevedi 'git switch <branch inesistente>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "scarta le modifiche locali"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "albero da cui eseguire il checkout"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "ripristina l'indice"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignora voci non sottoposte a merge"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "usa modalità overlay"
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"<percorsi>..."
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "Eliminazione di %s in corso\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Eliminerei %s\n"
#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "eliminazione di %s non riuscita"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "impossibile eseguire l'lstat di %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"pippo - seleziona un elemento basandoti su un prefisso univoco\n"
" - (vuoto) non selezionare niente\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - seleziona tutti gli elementi\n"
" - (vuoto) termina il processo di selezione\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Eh (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Immetti i pattern da ignorare>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Seleziona gli elementi da eliminare"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Eliminare %s [y/N]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Ciao.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - visualizza questa schermata\n"
"? - guida al prompt di selezione"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Comandi ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Cosa faccio ora"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Eliminerei il seguente elemento:"
msgstr[1] "Eliminerei i seguenti elementi:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Non ci sono più file da ripulire, esco."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "non stampare i nomi dei file eliminati"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "forza l'operazione"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "pulizia interattiva"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "rimuovi intere directory"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "pattern"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "aggiungi <pattern> alle regole usate per ignorare i file"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "elimina anche i file ignorati"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "elimina solo i file ignorati"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x e -X non possono essere usati insieme"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce è impostato a true e né -i, né -n, né -f sono stati "
"specificati; mi rifiuto di eseguire la pulizia"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f "
"sono stati specificati; mi rifiuto di eseguire la pulizia"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opzioni>] [--] <repository> [<directory>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "non creare un checkout"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "crea un repository spoglio"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "crea un repository mirror (implica che sia spoglio)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "per clonare da un repository locale"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "non usare i collegamenti reali locali, copia sempre i file"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "imposta il repository come condiviso"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "specificatore percorso"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inizializza sottomoduli durante la clonazione"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "numero di sottomoduli clonati in parallelo"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "directory modelli"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directory da cui saranno recuperati i modelli"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "repository di riferimento"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "usa --reference solo durante la clonazione"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "nome"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nome> anziché 'origin' per tracciare l'upstream"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "percorso al comando remoto git-upload-pack"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "profondità"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "crea un clone shallow con questa profondità"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "tempo"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "crea un clone shallow a partire dall'istante specificato"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revisione"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"aumenta la profondità della cronologia del clone shallow fino alla revisione "
"specificata esclusa"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "clona solo un branch, HEAD o quello specificato con --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "non clonare alcun tag e fai sì che i fetch successivi non li seguano"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "tutti i sottomoduli clonati saranno shallow"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "directory Git"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa la directory Git dall'albero di lavoro"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "chiave=valore"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "imposta la configurazione nel nuovo repository"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "specifica del server"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "opzione da trasmettere"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "usa solo indirizzi IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "usa solo indirizzi IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+"tutti i sottomoduli clonati useranno il loro rispettivo branch remoto "
+"tracciato"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Non è stato possibile indovinare alcun nome directory.\n"
"Specifica una directory tramite la riga di comando"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "apertura di '%s' non riuscita"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s esiste e non è una directory"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "stat di %s non riuscito\n"
+msgid "failed to start iterator over '%s'"
+msgstr "impossibile avviare l'iteratore su '%s'"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "unlink di '%s' non riuscito"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "creazione del collegamento '%s' non riuscita"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "copia del file in '%s' non riuscita"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "iterazione su '%s' non riuscita"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "fatto.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Clone completato con successo, ma il checkout non è riuscito.\n"
"Puoi esaminare gli elementi di cui è stato eseguito il checkout\n"
"con 'git status' e riprovare ad eseguire il checkout con\n"
-"'git checkout -f HEAD'\n"
+"'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossibile trovare il branch remoto %s da clonare."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "impossibile aggiornare %s"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile "
"eseguire il checkout.\n"
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "impossibile eseguire il checkout dell'albero di lavoro"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "impossibile scrivere i parametri nel file di configurazione"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "impossibile eseguire il repack per pulire l'area di lavoro"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "impossibile eseguire l'unlink del file alternates temporaneo"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Troppi argomenti."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Devi specificare un repository da clonare."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "le opzioni --bare e --origin %s non sono compatibili."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "le opzioni --bare e --separate-git-dir non sono compatibili."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "il repository '%s' non esiste"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondità %s non è un numero positivo"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"il percorso di destinazione '%s' esiste già e non è una directory vuota."
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'albero di lavoro '%s' esiste già."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossibile creare le prime directory di '%s'"
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossibile creare la directory dell'albero di lavoro '%s'"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clone nel repository spoglio '%s' in corso...\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clone in '%s' in corso...\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"il clone --recursive non è compatibile né con --reference né con --reference-"
"if-able"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://."
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://."
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://."
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "il repository sorgente è shallow, ignoro l'opzione --local"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "l'opzione --local è ignorata"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Il branch remoto %s non è stato trovato nell'upstream %s"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Sembra che tu abbia clonato un repository vuoto."
msgid "duplicate parent %s ignored"
msgstr "genitore duplicato %s ignorato"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "%s non è un nome oggetto valido"
msgid "id of a parent commit object"
msgstr "ID di un oggetto commit genitore"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "messaggio"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "messaggio di commit"
msgid "read commit log message from file"
msgstr "leggi il messaggio di log del commit da un file"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "firma il commit con GPG"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Altrimenti, usa 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Altrimenti, usa 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Se vuoi ignorare questo commit, usa:\n"
+"e quindi usa:\n"
+"\n"
+" git cherry-pick --continue\n"
"\n"
-" git reset\n"
+"per riprendere l'esecuzione il cherry-pick per i commit rimanenti.\n"
+"Se vuoi saltare questo commit, usa:\n"
+"\n"
+" git cherry-pick --skip\n"
"\n"
-"Quindi il comando \"git cherry-pick --continue\" farà riprendere\n"
-"il cherry picking per i commit rimanenti.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "impossibile creare l'indice temporaneo"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "aggiunta interattiva non riuscita"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "impossibile aggiornare l'indice temporaneo"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Impossibile aggiornare l'albero cache principale"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "impossibile scrivere il file new_index"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "impossibile eseguire un commit parziale durante un merge."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossibile eseguire un commit parziale durante un cherry-pick."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "impossibile leggere l'indice"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "impossibile scrivere il file indice temporaneo"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "dal commit '%s' manca l'intestazione autore"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "il commit '%s' ha una riga autore malformata"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "parametro --author malformato"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"impossibile selezionare un carattere commento non usato\n"
"nel messaggio di commit corrente"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "impossibile trovare il commit %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lettura del messaggio di log dallo standard input)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "impossibile leggere il log dallo standard input"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "impossibile leggere il file di log '%s'"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "impossibile leggere SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "impossibile leggere MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "impossibile scrivere il modello di commit"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"e riprova.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
"con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n"
"Un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutore: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sEsecutore commit: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Impossibile leggere l'indice"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Errore durante la costruzione degli alberi"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-"--author '%s' non è nel formato 'Nome <email>' e non corrisponde ad alcun "
+"--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun "
"autore esistente"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo non valido ignorato: '%s'"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo file non tracciati non valido: '%s'"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long e -z non sono compatibili"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Non c'è nulla da modificare."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Le opzioni --squash e --fixup non possono essere usate insieme"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "L'opzione -m non può essere combinata con -c/-C/-F."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Può essere usata solo una delle opzioni --include/--only/--all/--"
"interactive/--patch."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Non specificare un percorso con le opzioni --include/--only non ha senso."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "i percorsi '%s ...' non hanno senso con -a"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "visualizza concisamente lo stato"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "visualizza le informazioni sul branch"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "visualizza le informazioni sullo stash"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "calcola tutti i valori dopo/prima di"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "versione"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "output leggibile da una macchina"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "visualizza lo stato in forma lunga (impostazione predefinita)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "termina le voci con NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"visualizza file non tracciati, modalità facoltative: all, normal, no. "
"(Impostazione predefinita: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"visualizza file ignorati, modalità facoltative: traditional, matching, no. "
"(Impostazione predefinita: traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
"untracked. (Impostazione predefinita: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "elenca i file non tracciati in colonne"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "non rilevare le ridenominazioni"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr ""
"rileva le ridenominazioni, imposta facoltativamente l'indice di similarità"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinazione di argomenti sui file ignorati e non tracciati non supportata"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr ""
"ometti di visualizzare il riepilogo dopo un commit completato con successo"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "visualizza il diff nel modello del messaggio di commit"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Opzioni messaggio di commit"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "leggi il messaggio da un file"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "autore"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "sovrascrivi l'autore per il commit"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "data"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "sovrascrivi la data per il commit"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "riusa il messaggio del commit specificato per poi modificarlo"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "riusa il messaggio del commit specificato"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa il messaggio in formato autosquash per correggere il commit specificato"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa il messaggio in formato autosquash per eseguire lo squash del commit "
"specificato"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "aggiungi Signed-off-by:"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "usa il file modello specificato"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "forza la modifica del commit"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "includi lo stato nel modello del messaggio di commit"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Opzioni contenuto commit"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "esegui il commit di tutti i file modificati"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "aggiungi i file specificati all'indice per il commit"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "aggiungi i file in modalità interattiva"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "aggiungi le modifiche in modalità interattiva"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "esegui il commit solo dei file specificati"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignora gli hook pre-commit e commit-msg"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "modifica il commit precedente"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "ignora l'hook post-rewrite"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "accetta di registrare una modifica vuota"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "accetta di registrare una modifica con un messaggio vuoto"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "File MERGE_HEAD corrotto (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "impossibile leggere MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "impossibile leggere il messaggio di commit: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Interrompo il commit; non hai modificato il messaggio.\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"Il repository è stato aggiornato, ma non è stato\n"
"possibile scrivere il file new_index. Verifica che il\n"
"disco non sia pieno e che la quota non sia stata\n"
-"superata, quindi esegui \"git reset HEAD\" per procedere\n"
-"al ripristino."
+"superata, quindi esegui \"git restore --staged :/\" per\n"
+"procedere al ripristino."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <directory oggetti>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <directory oggetti>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <directory oggetti>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <directory oggetti>] [--append] [--"
-"reachable|--stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] "
+"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "directory"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "La directory oggetti in cui memorizzare il grafo"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Impossibile aprire il grafo dei commit '%s'"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "inizia la visita da tutti i riferimenti"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"esamina i pack-index elencati sullo standard input alla ricerca di commit"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "inizia la visita ai commit elencati sullo standard input"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "includi tutti i commit già presenti nel file commit-graph"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "consenti la scrittura di un file grafo dei commit incrementale"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<opzioni>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argomento --type non riconosciuto: %s"
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "al valore è assegnato questo tipo"
"visualizza l'origine del file di configurazione (file, standard input, blob, "
"riga di comando)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "valore"
msgid "do not consider tags matching <pattern>"
msgstr "non considerare i tag corrispondenti al <pattern>"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "visualizza l'oggetto commit abbreviato come fallback"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "nessun <comando> specificato per --extcmd=<comando>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opzioni> <variabile d'ambiente>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "tipo"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+"impostazione predefinita su cui ripiegheranno le chiamate git_env_*(...)"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+"non visualizzare messaggi, usa solo il valore di git_env_*() come codice "
+"d'uscita"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"l'opzione `--default' richiede un valore booleano con `--type=bool`, non `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"l'opzione `--default' richiede un valore unsigned long con `--type=ulong`, "
+"non `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opzioni-elenco-rev]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "visualizza l'avanzamento dopo <n> oggetti"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "seleziona la gestione dei tag firmati"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"seleziona la gestione dei messaggi di commit in una codifica alternativa"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Esegui il dump dei contrassegni in questo file"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importa i contrassegni da questo file"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Usa un tagger falso se i tag non ne hanno uno"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Visualizza in output l'albero completo per ogni commit"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Usa la funzionalità \"fatto\" per terminare il flusso"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Ometti l'output dei dati dei blob"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "specificatore riferimento"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Applica lo specificatore riferimento ai riferimenti esportati"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "rendi anonimo l'output"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Visualizza gli ID oggetto originari dei blob/commit"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opzioni>] <gruppo>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opzioni>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "esegui il fetch da tutti i remoti"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "percorso in cui caricare il pack sul remoto"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "forza la sovrascrittura del riferimento locale"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "esegui il fetch da più remoti"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "esegui il fetch di tutti i tag e degli oggetti associati"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "non eseguire il fetch di alcun tag (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "numero di sottomoduli recuperati in parallelo"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"elimina i tag locali non più presenti sul remoto e sovrascrivi i tag "
"modificati"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "a richiesta"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "controlla il recupero ricorsivo dei sottomoduli"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "mantieni il pack scaricato"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "consenti l'aggiornamento del riferimento HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "aumenta la profondità della cronologia di un clone shallow"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr ""
"aumenta la profondità della cronologia di un clone shallow in base al tempo"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "converti in un repository completo"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"impostazione predefinita per il recupero ricorsivo dei sottomoduli (a "
"priorità minore rispetto ai file di configurazione)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "accetta i riferimenti che aggiornano .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "mappa riferimenti"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "specifica la mappa dei riferimenti per il fetch"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "esegui 'gc --auto' dopo il fetch"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Impossibile trovare l'HEAD del riferimento remoto"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "oggetto %s non trovato"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[aggiornato]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[rifiutato]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "impossibile eseguire il fetch nel branch corrente"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[tag aggiornato]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "impossibile aggiornare il riferimento locale"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "sovrascriverebbe il tag esistente"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[nuovo tag]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nuovo branch]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[nuovo riferimento]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "aggiornamento forzato"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
-msgstr "non fast-forward"
+msgstr "non fast forward"
+
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Il fetch normalmente indica quali branch siano stati sottoposti ad\n"
+"aggiornamento forzato, ma tale controllo è stato disabilitato. Per\n"
+"riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
+"fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Sono stati richiesti %.2f secondi per controllare la presenza di eventuali\n"
+"aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n"
+"'git config fetch.showForcedUpdates false' per omettere questo controllo.\n"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s non ha inviato tutti gli oggetti necessari\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s rifiutato perché non è consentito aggiornare radici shallow"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Da %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"eseguire\n"
" 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s diventerà pendente)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s è diventato pendente)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[eliminato]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(nessuno)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non "
"bare"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'opzione \"%s\" è ignorata per %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Recupero di %s in corso\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Impossibile recuperare %s"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter può essere usato solo con il remoto configurato nelle estensioni."
"partialClone"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Non è stato specificato alcun repository remoto. Specifica un URL o il\n"
"nome di un remoto da cui dovranno essere recuperate le nuove revisioni."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Devi specificare il nome di un tag."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Le profondità negative in --deepen non sono supportate"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow non possono essere usati insieme."
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow su un repository completo non ha senso"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all non richiede un repository come argomento"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all non ha senso con degli specificatori riferimento"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Remoto o gruppo remoti non esistente: %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Recuperare un gruppo e specificare gli specificatori riferimento non ha senso"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "visualizza solo <n> riferimenti corrispondenti"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "rispetta le stringhe di formato per i colori"
msgid "Checking %s link"
msgstr "Controllo collegamento %s"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s non valido"
msgid "show verbose names for reachable objects"
msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Controllo oggetti in corso"
msgid "cannot stat '%s'"
msgstr "impossibile eseguire lo stat di '%s'"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "impossibile leggere '%s'"
"gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se "
"non lo è)"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "non vi è supporto per i thread, ignoro %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossibile leggere il tree (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossibile eseguire grep su un oggetto di tipo %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch '%c' richiede un valore numerico"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "cerca nell'index anziché nell'albero di lavoro"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "la ricerca nei contenuti non è gestita da Git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "cerca sia nei file tracciati sia in quelli non tracciati"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignora i file specificati in '.gitignore'"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "cerca ricorsivamente in ogni sottomodulo"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "visualizza le righe non corrispondenti"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "elabora i file binari come testuali"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "non cercare corrispondenze ai pattern nei file binari"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "elabora i file binari con filtri di conversione in testo"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "cerca nelle sottodirectory (impostazione predefinita)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "scendi al più di <profondità> livelli"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "usa espressioni regolari POSIX estese"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "interpreta i pattern come stringhe fisse"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "usa espressioni regolari compatibili con Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "visualizza numeri di riga"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "visualizza il numero di colonna della prima corrispondenza"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "non visualizzare i nomi file"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "visualizza i nomi file"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "visualizza i nomi file relativi alla directory di primo livello"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "visualizza solo i nomi file anziché le righe corrispondenti"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "sinonimo di --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "visualizza solo i nomi dei file non corrispondenti"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "stampa NUL dopo i nomi file"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "visualizza solo le parti corrispondenti di una riga"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "evidenzia corrispondenze"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"visualizza il nome file solo una volta prima delle corrispondenze nello "
"stesso file"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "usa <n> thread di lavoro"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "scorciatoia per -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "visualizza una riga con il nome funzione prima delle corrispondenze"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "visualizza la funzione circostante"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "leggi le corrispondenze da un file"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "cerca corrispondenze con <pattern>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "combina i pattern specificati con -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr ""
"segnala una corrispondenza con il codice di uscita senza emettere output"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr ""
"visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per "
"tutti i pattern"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "visualizza l'albero di analisi per l'espressione grep"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "pager"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "visualizza i file corrispondenti nel pager"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "consenti"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "nessun pattern specificato"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked non possono essere usate con le revisioni"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossibile risolvere la revisione %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "combinazione di opzioni non valida, ignoro --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "non vi è supporto per i thread, ignoro --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "specificato numero non valido di thread (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager funziona solo sull'albero di lavoro"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "opzione non supportata con --recurse-submodules"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked non possono essere usate con --no-index"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "sono specificati sia --cached sia degli alberi"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "tipo"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "tipo oggetto"
msgid "no info viewer handled the request"
msgstr "nessun visualizzatore info ha gestito la richiesta"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' è un alias di '%s'"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "stringa alias.%s non valida: %s"
msgid "'git help config' for more information"
msgstr "Vedi 'git help config' per maggiori informazioni"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "tipo oggetto non corrispondente in %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "non si è ricevuto l'oggetto atteso %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "oggetto %s: atteso tipo %s, trovato %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossibile riempire %d byte"
msgstr[1] "impossibile riempire %d byte"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "EOF prematuro"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "errore di lettura in input"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "usati più byte di quelli disponibili"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "pack troppo largo per la definizione corrente di off_t"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "il pack supera la dimensione massima consentita"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossibile creare '%s'"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossibile aprire il file pack '%s'"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "la firma del pack non coincide"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versione pack %<PRIu32> non supportata"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "il pack ha un oggetto danneggiato all'offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "inflate ha restituito il codice %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "overflow del valore dell'offset base del delta"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "l'offset base del delta è fuori dall'intervallo consentito"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "tipo oggetto %d sconosciuto"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "impossibile eseguire pread sul file pack"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fine del file pack prematura, %<PRIuMAX> byte mancante"
msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "inconsistenza grave di inflate"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "TROVATA COLLISIONE SHA1 CON %s !"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "impossibile leggere %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "non è possibile leggere l'oggetto %s esistente"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "oggetto blob %s non valido"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "errore fsck nell'oggetto sottoposto a pack"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "applicazione del delta non riuscita"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Ricezione degli oggetti"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Indicizzazione degli oggetti"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "il pack è corrotto (SHA1 non corrisponde)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "impossibile eseguire fstat sul file pack"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "il pack ha dati inutili alla fine"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusione oltre ogni follia in parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Risoluzione dei delta"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "impossibile creare il thread: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "confusione oltre ogni follia"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completato con %d oggetto locale"
-msgstr[1] "completato con %d oggetto locali"
+msgstr[1] "completato con %d oggetti locali"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Checksum in coda inatteso per %s (disco corrotto?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "pack ha %d delta irrisolto"
msgstr[1] "pack ha %d delta irrisolti"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "l'oggetto locale %s è corrotto"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "il nome del file pack '%s' non termina con '.pack'"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossibile scrivere il file %s '%s'"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "impossibile chiudere il file %s scritto '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "errore nella chiusura del file pack"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "impossibile archiviare il file pack"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "impossibile archiviare index file"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "pack.indexversion=%<PRIu32> non valida"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossibile aprire il file pack '%s' esistente"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossibile aprire il file pack idx esistente per '%s'"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "non delta: %d oggetto"
msgstr[1] "non delta: %d oggetti"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "lunghezza della catena = %d: %lu oggetto"
msgstr[1] "lunghezza della catena = %d: %lu oggetti"
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "impossibile tornare alla directory di lavoro corrente"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s errato"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin non può essere usato senza --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin richiede un repository Git"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify senza un nome del file pack specificato"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "errore fsck negli oggetti sottoposti a pack"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "specifica che il repository Git deve essere condiviso con più utenti"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "impossibile creare la directory %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "impossibile modificare la directory corrente in %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-"
"dir=<directory>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossibile accedere all'albero di lavoro '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<valore>])...] [<file>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "modifica i file sul posto"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "rimuovi spazi dalle stringhe finali vuote"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "dove collocare la nuova stringa finale"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "azione da eseguire se la stringa finale esiste già"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "azione da eseguire se la stringa finale è mancante"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "emetti in output solo le stringhe finali"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "non applicare le regole di configurazione"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "unisci i valori resi contigui dagli spazi bianchi"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "imposta le opzioni di analisi"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "non trattare la sequenza --- in modo speciale"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "stringa finale"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "stringa/e finale/i da aggiungere"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer con --only-input non ha senso"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "nessun file di input specificato per la modifica sul posto"
msgid "git show [<options>] <object>..."
msgstr "git show [<opzioni>] <oggetto>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opzione --decorate non valida: %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "visualizza sorgente"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Usa il file mappatura e-mail"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "decora solo i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "non decorare i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "opzioni decorazione"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1"
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output finale: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: file non valido"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "tipo sconosciuto: %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers non ha alcun valore"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "il nome della directory di output è troppo lungo"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "impossibile aprire il file patch %s"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "è necessario specificare esattamente un intervallo"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "il valore non è un intervallo"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
-msgstr "la lettera di accompagnamento dev'essere in formato email"
+msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "creazione del file lettera di accompagnamento non riuscita"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "valore in-reply-to folle: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "due directory di output?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "commit %s sconosciuto"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "impossibile risolvere '%s' come riferimento valido"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"In alternativa puoi specificare manualmente il commit di base con\n"
"--base=<ID commit di base>"
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni"
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "il commit di base non dovrebbe essere nell'elenco revisioni"
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "impossibile ottenere l'ID della patch"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "inferenza degli intervalli range-diff non riuscita"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] anche con una singola patch"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] anche con più patch"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "stampa le patch sullo standard output"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "genera una lettera di accompagnamento"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "usa una sequenza numerica semplice per i nomi file di output"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "suff"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "usa <suff> anziché '.patch'"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "inizia a numerare le patch da <n> anziché da 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "contrassegna la serie come l'n-esima versione revisionata"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] anziché [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefisso>] anziché [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "salva i file risultanti in <dir>"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "non eliminare/aggiungere [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "non mandare in output diff binari"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "manda in output un hash costituito da soli zeri nell'intestazione From"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "non includere una patch corrispondente a un commit upstream"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"visualizza il formato della patch anziché l'impostazione predefinita (patch "
"+ stat)"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Messaggistica"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "intestazione"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
-msgstr "aggiungi intestazione email"
+msgstr "aggiungi intestazione e-mail"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
-msgstr "email"
+msgstr "e-mail"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "aggiungi intestazione A:"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "aggiungi intestazione Cc:"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "identità"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il "
"commit se assente)"
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "ID messaggio"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "rendi la prima e-mail una risposta a <ID messaggio>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "delimitatore"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "allega la patch"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "includi la patch nel messaggio"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
"profondo"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "aggiungi una firma"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "commit di base"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr ""
"aggiungi le informazioni prerequisito per l'albero alla serie delle patch"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "aggiungi una firma da file"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "non stampare i nomi file delle patch"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "revisione"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"visualizza le modifiche rispetto a <revisione> nella lettera di "
"accompagnamento o in una patch singola"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"visualizza le modifiche rispetto a <specificatore revisione> nella lettera "
"di accompagnamento o in una patch singola"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "percentuale in base a cui viene pesata la creazione"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "riga ident non valida: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "le opzioni -n e -k sono mutuamente esclusive"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only non ha senso"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status non ha senso"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check non ha senso"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "standard output, o directory, quale dei due?"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff richiede --cover-letter o una singola patch"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff rispetto alla versione %d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor richiede --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff richiede --cover-letter o una singola patch"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff rispetto alla versione %d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "impossibile leggere il file firma '%s'"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Generazione delle patch in corso"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "creazione dei file di output non riuscita"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "non stampare l'URL del remoto"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "eseguibile"
msgid "empty mbox: '%s'"
msgstr "mbox vuota: '%s'"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opzioni>] [<commit>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "lo switch 'm' richiede un valore"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "l'opzione `%s' richiede un valore"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Le strategie disponibili sono:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Le strategie personalizzate disponibili sono:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "non visualizzare un diffstat al termine del merge"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "visualizza un diffstat al termine del merge"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(sinonimo di --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"aggiungi (al più <n>) voci dal registro breve al messaggio di commit del "
"merge"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "crea un singolo commit anziché eseguire un merge"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "esegui un commit se il merge ha successo (impostazione predefinita)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "modifica il messaggio prima di eseguire il commit"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
-msgstr "consenti fast-forward (impostazione predefinita)"
+msgstr "consenti fast forward (impostazione predefinita)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
-msgstr "interrompi se il fast-forward non è possibile"
+msgstr "interrompi se il fast forward non è possibile"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "verifica che il commit specificato abbia una firma GPG valida"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "strategia"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "strategia di merge da usare"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "opzione=valore"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "opzione per la strategia di merge selezionata"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "messaggio di commit del merge (per un merge non fast-forward)"
+msgstr "messaggio di commit del merge (per un merge non fast forward)"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "interrompi il merge attualmente in corso"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "continua il merge attualmente in corso"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "consenti di unire cronologie non correlate"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "verifica hook commit-msg"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "non è stato possibile eseguire stash."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "esecuzione di stash non riuscita"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "non è un oggetto valido: %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree non riuscito"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (nulla di cui eseguire lo squash)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit di squash -- non aggiorno HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' non punta ad un commit"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Stringa branch.%s.mergeoptions errata: %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Non gestisco nulla che non sia il merge di due head."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opzione sconosciuta per merge-recursive: -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "impossibile scrivere %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Non è stato possibile leggere da '%s'"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"aggiornato in un topic branch.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Un messaggio vuoto interromperà il commit.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
"interromperà il commit.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Messaggio di commit vuoto."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Splendido.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Merge automatico fallito; risolvi i conflitti ed esegui il commit\n"
"del risultato.\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Nessun branch corrente."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Nessun remote per il branch corrente."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Nessun upstream di default definito per il branch corrente."
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Nessun branch che tracci un remoto per %s da %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valore errato '%s' nell'ambiente '%s'"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "non è qualcosa di cui possiamo eseguire il merge"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort non richiede argomenti"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)."
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit non richiede argomenti"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue non richiede argomenti"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Non hai concluso il merge (MERGE_HEAD esiste).\n"
"Esegui il commit delle modifiche prima di eseguire il merge."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
"Esegui il commit delle modifiche prima di eseguire il merge."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Non è possibile combinare --squash con --no-ff."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Non è possibile combinare --squash con --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Lo squash di un commit in un'head vuota non è ancora supportato"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Un commit non fast forward non ha senso in un'head vuota"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Già aggiornato."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aggiornamento di %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Provo con un merge veramente banale dentro l'indice...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Già aggiornato. Oh sì!"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
-msgstr "Fast-forward non possibile, stop."
+msgstr "Fast forward non possibile, interrompo l'operazione."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Ripristino l'albero in uno stato pulito...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Tentativo con la strategia di merge %s...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Nessuna strategia di merge ha gestito il merge.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge con la strategia %s fallito.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Uso %s per preparare una risoluzione manuale.\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgstr "consenti la creazione di più di un albero"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<directory>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack "
+"--batch-size=<dimensione>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
"directory oggetti contenente un insieme di coppie packfile e pack-index"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"durante il repack, raccogli i file pack di dimensioni più piccole in un "
+"gruppo più grande di queste dimensioni"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "troppi argomenti"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "l'opzione --batch-size è consentita solo per il sottocomando 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verbo non riconosciuto: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "sottocomando sconosciuto: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Rinominazione di %s in %s in corso\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "rinomina di '%s' non riuscita"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opzioni>] <commit>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opzioni>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opzioni>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "stampa solo i nomi (non lo SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "usa solo tag per denominare i commit"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "usa solo i riferimenti corrispondenti a <pattern>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignora i riferimenti corrispondenti a <pattern>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "leggi dallo standard input"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "dereferenzia tag nell'input (uso interno)"
msgid "the note contents have been left in %s"
msgstr "i contenuti della nota sono stati lasciati in %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "non è stato possibile aprire o leggere '%s'"
"esegui il commit del risultato con 'git notes merge --commit' o interrompi "
"il merge con 'git notes merge --abort'.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Risoluzione di '%s' come riferimento valido non riuscita."
msgid "use notes from <notes-ref>"
msgstr "usa le note in <riferimento note>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "sottocomando sconosciuto: %s"
"git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < "
"<elenco oggetti>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "CRC oggetto sottoposto a pack %s errato"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "oggetto sottoposto a pack %s corrotto"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "rilevato delta ricorsivo per l'oggetto %s"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u oggetti ordinati, attesi %<PRIu32>"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "packfile non valido: %s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "impossibile aprire il packfile per il suo riuso: %s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "impossibile eseguire seek nel packfile riusato"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "impossibile leggere dal packfile riusato"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"disabilito la scrittura delle bitmap, i pack sono divisi a causa "
"dell'impostazione pack.packSizeLimit"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Scrittura degli oggetti in corso"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "stat di %s non riuscito"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"disabilito la scrittura delle bitmap perché alcuni oggetti non saranno "
"sottoposti a pack"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow dell'offset base del delta nel pack per %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "offset base del delta fuori dall'intervallo consentito per %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Conteggio degli oggetti in corso"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "impossibile recuperare le dimensioni di %s"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "impossibile analizzare l'intestazione oggetto di %s"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "impossibile leggere l'oggetto %s"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "pack subottimo - memoria esaurita"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compressione delta in corso, uso fino a %d thread"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Compressione oggetti in corso"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "inconsistenza con il numero dei delta"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"atteso ID oggetto arco, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"atteso ID oggetto, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "valore non valido per --missing"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "impossibile aprire l'indice pack"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "impossibile esaminare l'oggetto sciolto %s"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "impossibile forzare l'oggetto sciolto"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' non è una revisione"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "revisione '%s' errata"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "impossibile aggiungere gli oggetti recenti"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "versione %s di index non supportata"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "versione '%s' di index errata"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "non visualizzare la barra di avanzamento"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "visualizza la barra di avanzamento"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr ""
"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<versione>[,<offset>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "scrivi il file indice pack usando la versione formato idx specificata"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "dimensione massima di ogni file pack in output"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "ignora gli oggetti sottoposti a pack"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "limita la finestra di pack al numero di oggetti specificato"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limita la finestra di pack alla memoria specificata in aggiunta al limite "
"sugli oggetti"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "lunghezza massima della catena di delta consentita nel pack risultante"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "riusa i delta esistenti"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "riusa gli oggetti esistenti"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "usa oggetti OFS_DELTA"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr ""
"usa più thread durante la ricerca delle migliori corrispondenze per i delta"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "non creare un output pack vuoto"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "leggi gli argomenti revisione dallo standard input"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "limita gli oggetti a quelli non ancora sottoposti a pack"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "includi gli oggetti referenziati da voci del log riferimenti"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "includi gli oggetti referenziati dall'indice"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "invia il pack in output sullo standard output"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a "
"pack"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "mantieni gli oggetti non raggiungibili"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "usa l'algoritmo di raggiungibilità sparse"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "crea pack thin"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "crea pack adatti per fetch shallow"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "ignora i pack che hanno un file .keep che li accompagna"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "ignora questo pack"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "livello compressione pack"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "non nascondere i commit innestati"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usa un indice bitmap se disponibile per velocizzare il conteggio degli "
"oggetti"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "scrivi un indice bitmap insieme all'indice pack"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "scrivi un indice bitmap se possibile"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "azione da eseguire sugli oggetti mancanti"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "non eseguire il pack degli oggetti nei file pack promettenti"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "rispetta le isole durante la compressione delta"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size non può essere usato per generare un pack da trasferire"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "il limite minimo delle dimensioni dei pack è 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin non può essere usato per generare un pack indicizzabile"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "impossibile usare --filter senza --stdout"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Enumerazione degli oggetti in corso"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "controlla il recupero ricorsivo dei sottomoduli"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Opzioni relative al merge"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora le modifiche eseguendo un rebase anziché un merge"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
-msgstr "consenti fast-forward"
+msgstr "consenti fast forward"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Opzioni relative al fetch"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "forza la sovrascrittura del branch locale"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "numero di sottomoduli recuperati in parallelo"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valore non valido per pull.ff: %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
"appena recuperati."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti "
"appena recuperati."
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"In generale, questo significa che hai fornito uno specificatore\n"
"riferimento che non aveva corrispondenze nel remoto."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"configurato come predefinito per il branch corrente, devi\n"
"specificare un branch sulla riga di comando."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Attualmente non sei su un branch."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Specifica il branch in base a cui vuoi effettuare il rebase."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Specifica il branch in base a cui vuoi effettuare il merge."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Vedi git-pull(1) per ulteriori dettagli."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branch>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Non ci sono informazioni di tracciamento per il branch corrente."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Se vuoi impostare le informazioni di tracciamento per questo branch puoi "
"farlo con:"
-#: builtin/pull.c:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"il merge con il riferimento '%s' del remoto, ma un tale\n"
"riferimento non è stato recuperato."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "impossibile accedere al commit %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "ignoro --verify-signature per il rebase"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opzione --[no-]autostash option è valida solo con --rebase."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice."
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "eseguine il commit o lo stash."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
msgstr ""
"il fetch ha aggiornato l'head del\n"
"branch corrente.\n"
-"Eseguo il fast-forward dell'albero\n"
+"Eseguo il fast forward dell'albero\n"
"di lavoro dal commit %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"to recover."
msgstr ""
-"Impossibile eseguire il fast-forward dell'albero\n"
+"Impossibile eseguire il fast forward dell'albero\n"
"di lavoro.\n"
"Dopo esserti assicurato di aver salvato tutto ciò\n"
"che è importante dall'output di\n"
"$ git reset --hard\n"
"per eseguire il ripristino."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossibile eseguire il merge di più branch in un head vuoto."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Impossibile eseguire il rebase su più branch."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossibile eseguire il rebase se ci sono delle modifiche registrate "
"attuale è rimasto indietro rispetto alla sua controparte remota.\n"
"Integra le modifiche remote (ad es. con 'git pull ...') prima di\n"
"eseguire nuovamente il push.\n"
-"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
#: builtin/push.c:282
"alla sua controparte remota. Esegui il checkout di questo branch e\n"
"integra le modifiche remote (ad es. con 'git pull ...') prima di\n"
"eseguire nuovamente il push.\n"
-"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
#: builtin/push.c:288
"da un altro repository allo stesso riferimento. Potresti voler integrare\n"
"le modifiche remote (ad es. con 'git pull ...') prima di eseguire\n"
"nuovamente il push.\n"
-"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n"
+"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
#: builtin/push.c:295
msgid "keep empty commits"
msgstr "mantieni i commit vuoti"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "consenti commit con messaggi vuoti"
msgid "sign commits"
msgstr "firma i commit"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "visualizza un diffstat delle modifiche upstream"
msgid "the command to run"
msgstr "il comando da eseguire"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s richiede un rebase interattivo"
msgid "Cannot store %s"
msgstr "Impossibile memorizzare %s"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "impossibile determinare la revisione HEAD"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"Per interrompere l'operazione e tornare allo stato precedente\n"
"il \"git rebase\", esegui \"git rebase --abort\"."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"Di conseguenza, Git non può eseguirne il rebase."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "i comandi exec non possono contenere caratteri di fine riga"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "comando exec vuoto"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "esegui il rebase sul branch specificato anziché su quello upstream"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "consenti l'esecuzione dell'hook pre-rebase"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "sii silenzioso. implica --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "non visualizzare un diffstat delle modifiche upstream"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "aggiungi una riga Signed-off-by: a ogni commit"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "passato a 'git am'"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "passato a 'git apply'"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "salta la patch corrente e continua"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "interrompi ed esegui il checkout del branch originario"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "interrompi ma mantieni l'HEAD dov'è"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "modifica l'elenco todo durante un rebase interattivo"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr ""
"visualizza il file patch che sta per essere applicato o sottoposto a merge"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "usa le strategie di merge per eseguire il rebase"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr ""
"consenti all'utente di modificare l'elenco dei commit di cui eseguire il "
"rebase"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "mantieni i commit vuoti durante il rebase"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "sposta i commit che iniziano con squash!/fixup! in -i"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "esegui stash/stash pop automaticamente prima e dopo"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "aggiungi righe exec dopo ogni commit della lista modificabile"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "consenti il rebase di commit con messaggi vuoti"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "prova ad eseguire il rebase dei merge anziché saltarli"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "usa la strategia di merge specificata"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "opzione"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argomento alla strategia di merge"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"il supporto per rebase.useBuiltin è stato rimosso!\n"
"Vedi la voce relativa in 'git help config' per i dettagli."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Nessun rebase in corso?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'azione --edit-todo può essere usata solo durante un rebase interattivo."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Impossibile leggere l'HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"quindi contrassegnarli come risolti usando\n"
"git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "impossibile scartare le modifiche all'albero di lavoro"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "impossibile ritornare a %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "impossibile rimuovere '%s'"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n"
"salvato qualcosa di importante lì.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "l'opzione `C` richiede un valore numerico"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo sconosciuto: %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy richiede --merge o --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec richiede --exec o --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr "non è possibile combinare le opzioni am con quelle interactive o merge"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-"
"exec'"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "impossibile combinare '--rebase-merges' con '--strategy'"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream non valido: '%s'"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Impossibile creare il nuovo commit radice"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': è necessario specificare esattamente una base per il merge"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' non punta a un commit valido"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "errore fatale: branch/commit '%s' inesistente"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Riferimento non esistente: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Impossibile risolvere HEAD come revisione"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Impossibile eseguire lo stash automatico"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Risposta stash non attesa: '%s'"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Impossibile creare la directory '%s'"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Stash automatico creato: %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "impossibile eseguire reset --hard"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ora si trova a %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Eseguine il commit o lo stash."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "impossibile analizzare '%s'"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "impossibile passare a %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD è aggiornato."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Il branch corrente %s è aggiornato.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD è aggiornato, forzo il rebase."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Modifiche a %s:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modifiche da %s a %s:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di "
"esso...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Impossibile scollegare l'HEAD"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
-msgstr "Fast-forward da %s a %s eseguito.\n"
+msgstr "Fast forward da %s a %s eseguito.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <directory Git>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"il comportamento predefinito, imposta la variabile di\n"
"configurazione 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
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"
"Per non visualizzare più questo messaggio, puoi impostarla a\n"
"'refuse'."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "non visualizzare messaggi"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Devi specificare una directory."
#: builtin/remote.c:1042
msgid "fast-forwardable"
-msgstr "fast-forward possibile"
+msgstr "fast forward possibile"
#: builtin/remote.c:1045
msgid "local out of date"
"Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
"pack.writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"impossibile avviare pack-objects per eseguire il repack degli oggetti "
"promettenti"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Da pack-objects mi attendevo solo righe con gli ID completi "
"esadecimali degli oggetti."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"impossibile portare a termine pack-objects per eseguire il repack degli "
"oggetti promettenti"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "esegui il pack di tutto in un singolo pack"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "come -a e rendi sciolti gli oggetti non raggiungibili"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "non eseguire git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "fornisci l'opzione --local a git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "scrivi l'indice bitmap"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "fornisci l'opzione --delta-islands a git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "data approssimativa"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "dimensione della finestra usata per la compressione delta"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"come sopra, ma limita le dimensioni della memoria invece del numero di voci"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "limita la profondità massima dei delta"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "limita il numero massimo di thread"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "dimensione massima di ogni file pack"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "non eseguire il repack di questo pack"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A non sono compatibili"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"AVVISO: non è riuscito. Ridenominali manualmente\n"
"AVVISO: entro %s:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "eliminazione di '%s' non riuscita"
msgid "Could not write new index file."
msgstr "Impossibile scrivere il nuovo file indice."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "impossibile combinare --exclude-promisor-objects e --missing"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "il filtraggio oggetti richiede --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "valore sparse non valido: '%s'"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list non supporta la visualizzazione delle note"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
msgid "cancel revert or cherry-pick sequence"
msgstr "annulla la sequenza revert o cherry-pick"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "salta il commit corrente e continua"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "non eseguire il commit automaticamente"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "modifica il messaggio di commit"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "numero-genitore"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "seleziona il genitore mainline"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "strategia di merge"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "opzione per la strategia di merge"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "aggiungi il nome del commit alla fine"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "mantieni i commit inizialmente vuoti"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "mantieni i commit ridondanti e vuoti"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "revert non riuscito"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick non riuscito"
#: builtin/shortlog.c:270
msgid "Show the email address of each author"
-msgstr "Visualizza l'indirizzo email di ogni autore"
+msgstr "Visualizza l'indirizzo e-mail di ogni autore"
#: builtin/shortlog.c:271
msgid "<w>[,<i1>[,<i2>]]"
msgstr[0] "ignoro %s; non posso gestire più di %d riferimento"
msgstr[1] "ignoro %s; non posso gestire più di %d riferimenti"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "nessun riferimento corrispondente a %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "visualizza i branch che ne tracciano uno remoto e quelli locali"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "visualizza i branch che ne tracciano uno remoto"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "colore '*!+-' corrispondente al branch"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "visualizza <n> commit ulteriori rispetto all'antenato comune"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "sinonimo di more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "non visualizzare le stringhe di denominazione"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "includi il branch corrente"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "denomina i commit con i loro nomi oggetto"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "visualizza le basi merge possibili"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "visualizza i riferimenti non raggiungibili da nessun altro"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "visualizza i commit in ordine topologico"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "visualizza solo i commit non sul primo branch"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "visualizza i merge raggiungibili solo dall'ultimo commit di un branch"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
"esegui un ordinamento topologico mantenendo l'ordine delle date ove possibile"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"visualizza le <n> voci più recenti del log dei riferimenti partendo da base"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog non è compatibile con --all, --remotes, --independent o --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "nessun branch fornito e l'HEAD non è valido"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "l'opzione --reflog richiede il nome di un branch"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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] "può essere visualizzata solo %d voce per volta."
msgstr[1] "possono essere visualizzate solo %d voci per volta."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "riferimento non esistente: %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "impossibile gestire più di %d revisione."
msgstr[1] "impossibile gestire più di %d revisioni."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' non è un riferimento valido."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossibile trovare il commit %s (%s)"
msgid "No branch name specified"
msgstr "Nome del branch non specificato"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossibile aggiornare %s con %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "messaggio di stash"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" richiede un argomento <commit>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Nessuna modifica selezionata"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Non hai ancora un commit iniziale"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Impossibile salvare lo stato corrente di index"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Impossibile salvare i file non tracciati"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Impossibile registrare lo stato dell'albero di lavoro"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossibile usare --patch e --include-untracked o --all allo stesso tempo"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Ti sei scordato di eseguire 'git add'?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Nessuna modifica locale da salvare"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Impossibile inizializzare stash"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Impossibile salvare lo stato attuale"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Directory di lavoro e stato indice salvati: %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Impossibile rimuovere le modifiche all'albero di lavoro"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "mantieni l'indice"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "esegui lo stash in modalità patch"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "modalità silenziosa"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "includi i file non tracciati nello stash"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "includi i file ignorati"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "impossibile eseguire %s"
msgid "prepend comment character and space to each line"
msgstr "anteponi il carattere commento e uno spazio a ogni riga"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Atteso nome riferimento completo, ricevuto %s"
msgid "cannot strip one component off url '%s'"
msgstr "impossibile rimuovere un componente dall'URL '%s'"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "ancoraggio alternativo per i percorsi relativi"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'"
"run_command ha restituito un codice diverso da zero per %s\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"nei sottomoduli innestati di %s\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Esegui ricorsivamente sui sottomoduli innestati"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"impossibile trovare la configurazione '%s'. Assumo che questo repository sia "
"il proprio repository autoritativo upstream."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opzioni>] [<percorso>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr ""
+msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr ""
+msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "ricorsione nel sottomodulo '%s' non riuscita"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
-msgstr ""
+msgstr "Non visualizzare l'output dello stato del sottomodulo"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
+"Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del "
+"sottomodulo"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
-msgstr ""
+msgstr "esegui ricorsivamente sui sottomoduli innestati"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
+"git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
-msgstr ""
+msgstr "git submodule--helper name <percorso>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
-msgstr ""
+msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
-msgstr ""
+msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr ""
+"Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
-msgstr ""
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
+"L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa "
+"'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
+"L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-"
+"f' per scartarle"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directory '%s' ripulita\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "impossibile creare la directory vuota del sottomodulo %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr ""
+msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
+"Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche "
+"locali"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
-msgstr ""
+msgstr "Annulla la registrazione di tutti i sottomoduli"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
+msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
-msgstr ""
+msgstr "non è possibile aggiungere un alternato per il sottomodulo '%s': %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr ""
+msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr ""
+msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
-msgstr ""
+msgstr "percorso in cui sarà clonato il nuovo sottomodulo"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
-msgstr ""
+msgstr "nome del nuovo sottomodulo"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
-msgstr ""
+msgstr "URL da cui clonare il sottomodulo"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
-msgstr ""
+msgstr "profondità per i cloni shallow"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
-msgstr ""
+msgstr "forza l'indicazione d'avanzamento della clonazione"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
+"git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference "
+"<repository>] [--name <nome>] [--depth <profondità>] --url <URL> --path "
+"<percorso>"
-#: builtin/submodule--helper.c:1423
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1424
+#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr ""
+msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito"
-#: builtin/submodule--helper.c:1437
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1438
+#, c-format
msgid "could not get submodule directory for '%s'"
-msgstr ""
+msgstr "impossibile recuperare la directory del sottomodulo per '%s'"
-#: builtin/submodule--helper.c:1473
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1474
+#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
+"Modalità aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')"
-#: builtin/submodule--helper.c:1477
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1478
+#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
+"È stata configurata una modalità aggiornamento '%s' non valida per il "
+"percorso del sottomodulo ('%s')"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr ""
+msgstr "Percorso del sottomodulo ('%s') non inizializzato"
-#: builtin/submodule--helper.c:1574
-#, fuzzy
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
-msgstr ""
+msgstr "Potresti voler usare 'update --init'."
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
-msgstr ""
+msgstr "Ignoro il sottomodulo %s non sottoposto a merge"
-#: builtin/submodule--helper.c:1633
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1634
+#, c-format
msgid "Skipping submodule '%s'"
-msgstr ""
+msgstr "Ignoro il sottomodulo '%s'"
-#: builtin/submodule--helper.c:1777
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1778
+#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
-msgstr ""
+msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
+"Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
-msgstr ""
+msgstr "percorso nell'albero di lavoro"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
+"percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
-msgstr ""
+msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr ""
+msgstr "Crea un clone shallow limitato al numero di revisioni specificato"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
-msgstr ""
+msgstr "processi da eseguire in parallelo"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
-msgstr ""
+msgstr "determina se il clone iniziale sarà shallow come raccomandato"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
-msgstr ""
+msgstr "non stampare l'indicazione di avanzamento della clonazione"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
+"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]"
-#: builtin/submodule--helper.c:1889
-#, fuzzy
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
-msgstr ""
+msgstr "valore parametro aggiornamento errato"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
+"Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch "
+"dal progetto al livello superiore, ma questo non è su alcun branch"
-#: builtin/submodule--helper.c:2060
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2061
+#, c-format
msgid "could not get a repository handle for submodule '%s'"
-msgstr ""
+msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
-msgstr ""
+msgstr "esegui ricorsivamente sui sottomoduli"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]"
#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
-msgstr ""
+msgstr "controlla se è sicuro scrivere sul file .gitmodules"
#: builtin/submodule--helper.c:2159
-#, fuzzy
msgid "unset the config in the .gitmodules file"
-msgstr ""
+msgstr "rimuovi la configurazione nel file .gitmodules"
#: builtin/submodule--helper.c:2164
msgid "git submodule--helper config <name> [<value>]"
-msgstr ""
+msgstr "git submodule--helper config <nome> [<valore>]"
#: builtin/submodule--helper.c:2165
msgid "git submodule--helper config --unset <name>"
-msgstr ""
+msgstr "git submodule--helper config --unset <nome>"
#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
-msgstr ""
+msgstr "git submodule--helper config --check-writeable"
#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
+msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
-msgstr ""
+msgstr "%s non supporta --super-prefix"
#: builtin/submodule--helper.c:2241
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr ""
+msgstr "'%s' non è un sottocomando submodule--helper valido"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
+msgstr "git symbolic-ref [<opzioni>] <nome> [<riferimento>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
+msgstr "git symbolic-ref -d [-q] <nome>"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
+"non visualizzare messaggi d'errore se ci sono riferimenti non simbolici "
+"(scollegati)"
#: builtin/symbolic-ref.c:41
-#, fuzzy
msgid "delete symbolic ref"
-msgstr ""
+msgstr "elimina riferimento simbolico"
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
-msgstr ""
+msgstr "abbrevia il riferimento nell'output"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
-msgstr ""
+msgstr "motivo"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
-msgstr ""
+msgstr "motivo dell'aggiornamento"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
msgstr ""
+"git tag [-a | -s | -u <ID chiave>] [-f] [-m <messaggio> | -F <file>]\n"
+"\t\t<nome tag> [<head>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
-msgstr ""
+msgstr "git tag -d <nome tag>..."
#: builtin/tag.c:28
msgid ""
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
+"git tag -l [-n[<numero>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <oggetto>]\n"
+"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<pattern>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr ""
+msgstr "git tag -v [--format=<formato>] <nome tag>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "tag '%s' non trovato."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' eliminato (era %s)\n"
-#: builtin/tag.c:134
-#, fuzzy, c-format
+#: builtin/tag.c:135
+#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
+"\n"
+"Scrivi un messaggio per il tag:\n"
+" %s\n"
+"Le righe che iniziano con '%c' saranno ignorate.\n"
-#: builtin/tag.c:138
-#, fuzzy, c-format
+#: builtin/tag.c:139
+#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
msgstr ""
+"\n"
+"Scrivi un messaggio per il tag:\n"
+" %s\n"
+"Le righe che iniziano con '%c' saranno mantenute; puoi rimuoverle "
+"autonomamente se lo desideri.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "impossibile firmare il tag"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
-msgstr "impossibile scrivere il file di tag"
+msgstr "impossibile scrivere il file tag"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
+"Hai creato un tag innestato. L'oggetto a cui si riferisce il tuo nuovo\n"
+"tag è già un tag. Se intendevi aggiungere un tag all'oggetto a cui\n"
+"punta, usa:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
-msgstr "tipo di oggetto errato."
+msgstr "tipo oggetto errato."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "nessun messaggio per il tag?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Il messaggio del tag è stato lasciato in %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
-msgstr ""
+msgstr "elenca i nomi dei tag"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
-msgstr ""
+msgstr "stampa le prime <n> righe di ogni messaggio tag"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "elimina tag"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
-msgstr ""
+msgstr "verifica tag"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
-msgstr ""
+msgstr "Opzioni creazione tag"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "tag annotato, richiede un messaggio"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "messaggio tag"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "forza modifica del messaggio tag"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
-msgstr ""
+msgstr "tag annotato e firmato con GPG"
-#: builtin/tag.c:413
-#, fuzzy
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
-msgstr "impossibile firmare il tag"
+msgstr "usa un'altra chiave per firmare il tag"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
-msgstr ""
+msgstr "sostituisci il tag se esiste"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
-msgstr ""
+msgstr "crea un registro riferimenti"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
-msgstr ""
+msgstr "Opzioni elenco tag"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
-msgstr ""
+msgstr "visualizza l'elenco dei tag in colonne"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
-msgstr ""
+msgstr "stampa solo i tag che contengono il commit"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
-msgstr ""
+msgstr "stampa solo i tag che non contengono i commit"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
-msgstr ""
+msgstr "stampa solo i tag sottoposti a merge"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
-msgstr ""
+msgstr "stampa solo i tag non sottoposti a merge"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
-msgstr ""
+msgstr "stampa solo i tag dell'oggetto"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column e -n non sono compatibili"
-#: builtin/tag.c:494
-#, fuzzy
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
-msgstr "l'opzione -n è consentita solo con -l."
+msgstr "l'opzione -n è consentita solo in modalità elenco"
-#: builtin/tag.c:496
-#, fuzzy
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
-msgstr "l'opzione --contains è consentita solo con -l."
+msgstr "l'opzione --contains è consentita solo in modalità elenco"
-#: builtin/tag.c:498
-#, fuzzy
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
-msgstr "l'opzione --contains è consentita solo con -l."
+msgstr "l'opzione --no-contains è consentita solo in modalità elenco"
-#: builtin/tag.c:500
-#, fuzzy
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
-msgstr "l'opzione --points-at è consentita solo con -l."
+msgstr "l'opzione --points-at è consentita solo in modalità elenco"
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
+"le opzioni --merged e --no-merged sono consentite solo in modalità elenco"
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "è consentita una sola opzione tra -F e -m."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "troppi parametri"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' non è un nome tag valido."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "il tag '%s' esiste già"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aggiornato (era %s)\n"
#: builtin/unpack-objects.c:500
-#, fuzzy
msgid "Unpacking objects"
-msgstr "Indicizzazione degli oggetti"
+msgstr "Decompressione degli oggetti in corso"
#: builtin/update-index.c:83
-#, fuzzy, c-format
+#, c-format
msgid "failed to create directory %s"
-msgstr "creazione della directory '%s' non riuscita"
+msgstr "creazione della directory %s non riuscita"
#: builtin/update-index.c:99
-#, fuzzy, c-format
+#, c-format
msgid "failed to create file %s"
-msgstr "creazione del link '%s' non riuscita"
+msgstr "creazione del file %s non riuscita"
#: builtin/update-index.c:107
-#, fuzzy, c-format
+#, c-format
msgid "failed to delete file %s"
-msgstr "creazione del link '%s' non riuscita"
+msgstr "eliminazione del file %s non riuscita"
#: builtin/update-index.c:114 builtin/update-index.c:220
-#, fuzzy, c-format
+#, c-format
msgid "failed to delete directory %s"
-msgstr "creazione della directory '%s' non riuscita"
+msgstr "eliminazione della directory %s non riuscita"
#: builtin/update-index.c:139
-#, fuzzy, c-format
+#, c-format
msgid "Testing mtime in '%s' "
-msgstr "chiusura del file '%s'"
+msgstr "Test di mtime in '%s' in corso "
#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
+"le informazioni stat della directory non cambiano dopo l'aggiunta di un "
+"nuovo file"
#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
+"le informazioni stat della directory non cambiano dopo l'aggiunta di una "
+"nuova directory"
#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
+"le informazioni stat della directory cambiano dopo l'aggiornamento di un file"
#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
+"le informazioni stat della directory cambiano dopo l'aggiunta di un file in "
+"una sottodirectory"
#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
+"le informazioni stat della directory non cambiano dopo l'eliminazione di un "
+"file"
#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
+"le informazioni stat della directory non cambiano dopo l'eliminazione di una "
+"directory"
#: builtin/update-index.c:221
msgid " OK"
-msgstr ""
+msgstr " OK"
#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
+msgstr "git update-index [<opzioni>] [--] [<file>...]"
#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
+"continua l'aggiornamento anche nel caso in cui l'indice richieda di essere "
+"aggiornato"
#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
-msgstr ""
+msgstr "aggiornamento: ignora i sottomoduli"
#: builtin/update-index.c:977
-#, fuzzy
msgid "do not ignore new files"
-msgstr "impossibile archiviare index file"
+msgstr "non ignorare i nuovi file"
#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
-msgstr ""
+msgstr "consenti che dei file sostituiscano delle directory e viceversa"
#: builtin/update-index.c:981
msgid "notice files missing from worktree"
-msgstr ""
+msgstr "nota se dei file mancano dall'albero di lavoro"
#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr ""
+"esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte "
+"a merge"
#: builtin/update-index.c:986
msgid "refresh stat information"
-msgstr ""
+msgstr "aggiorna le informazioni stat"
#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
+msgstr "come --refresh, ma ignora l'impostazione assume-unchanged"
#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
-msgstr ""
+msgstr "<modo>,<oggetto>,<percorso>"
#: builtin/update-index.c:995
-#, fuzzy
msgid "add the specified entry to the index"
-msgstr "Aggiunge il contenuto del file a index"
+msgstr "aggiunge la voce specificata all'indice"
#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
-msgstr ""
+msgstr "contrassegna i file come \"non saranno modificati\""
#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
-msgstr ""
+msgstr "reimposta a zero il bit \"non saranno modificati\""
#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
-msgstr ""
+msgstr "contrassegna i file come \"solamente da indicizzare\""
#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
-msgstr ""
+msgstr "reimposta a zero il bit \"solamente da indicizzare\""
#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
+"aggiungi solo all'indice; non aggiungere il contenuto al database oggetti"
#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
-msgstr ""
+msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro"
#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
+msgstr "con --stdin: le righe di input sono terminate da byte NULL"
#: builtin/update-index.c:1023
-#, fuzzy
msgid "read list of paths to be updated from standard input"
-msgstr "(lettura del messaggio di log dallo standard input)\n"
+msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input"
#: builtin/update-index.c:1027
-#, fuzzy
msgid "add entries from standard input to the index"
-msgstr "non è stato possibile leggere il log dallo standard input"
+msgstr "aggiungi le voci specificate sullo standard input all'indice"
#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
+msgstr "ripopola le fasi 2 e 3 per i percorsi elencati"
#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
-msgstr ""
+msgstr "aggiorna solo le voci differenti rispetto all'HEAD"
#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
-msgstr ""
+msgstr "ignora i file mancanti nell'albero di lavoro"
#: builtin/update-index.c:1042
msgid "report actions to standard output"
-msgstr ""
+msgstr "stampa le azioni sullo standard output"
#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
+"(per i comandi ad alto livello) dimentica i conflitti non risolti salvati"
#: builtin/update-index.c:1048
msgid "write index in this format"
-msgstr ""
+msgstr "scrivi l'indice in questo formato"
#: builtin/update-index.c:1050
-#, fuzzy
msgid "enable or disable split index"
-msgstr "Impossibile scrivere index."
+msgstr "abilita o disabilita l'indice suddiviso"
#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
-msgstr ""
+msgstr "abilita/disabilita la cache non tracciata"
#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
-msgstr ""
+msgstr "verifica se il filesystem supporta la cache non tracciata"
#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
-msgstr ""
+msgstr "abilita la cache non tracciata senza testare il filesystem"
#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
-msgstr ""
+msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato"
#: builtin/update-index.c:1060
-#, fuzzy
msgid "enable or disable file system monitor"
-msgstr "impossibile gestire il tipo di file %d"
+msgstr "abilita o disabilita il monitor del filesystem"
#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
-msgstr ""
+msgstr "contrassegna i file come validi rispetto al monitor del filesystem"
#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr ""
+"reimposta a zero il bit \"file validi rispetto al monitor del filesystem\""
#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
+"core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi "
+"veramente abilitare l'indice suddiviso"
#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
+"core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente "
+"disabilitare l'indice suddiviso"
#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
+"core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi "
+"veramente disabilitare la cache non tracciata"
#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
-msgstr ""
+msgstr "Cache non tracciata disabilitata"
#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
+"core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi "
+"veramente abilitare la cache non tracciata"
#: builtin/update-index.c:1204
-#, fuzzy, c-format
+#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr "make_cache_entry non riuscito per il path '%s'"
+msgstr "Cache non tracciata abilitata per '%s'"
#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
+"core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il "
+"monitor del filesystem"
#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
-msgstr ""
+msgstr "monitor filesystem abilitato"
#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
+"core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente "
+"disabilitare il monitor del filesystem"
#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
-msgstr ""
+msgstr "monitor filesystem disabilitato"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
+msgstr "git update-ref [<opzioni>] -d <nome riferimento> [<vecchio valore>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
+"git update-ref [<opzioni>] <nome riferimento> <nuovo valore> [<vecchio "
+"valore>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
+msgstr "git update-ref [<opzioni>] --stdin [-z]"
#: builtin/update-ref.c:364
msgid "delete the reference"
-msgstr ""
+msgstr "elimina il riferimento"
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
-msgstr ""
+msgstr "aggiorna <nome riferimento>, non ciò a cui punta"
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
-msgstr ""
+msgstr "lo standard input ha argomenti terminati da NUL"
#: builtin/update-ref.c:368
msgid "read updates from stdin"
-msgstr ""
+msgstr "leggi aggiornamenti dallo standard input"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
-msgstr ""
+msgstr "git update-server-info [--force]"
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
-msgstr ""
+msgstr "aggiorna i file informazioni partendo da zero"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr ""
+msgstr "git upload-pack [<opzioni>] <directory>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
-msgstr ""
+msgstr "esci dopo un solo scambio richiesta/risposta"
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
-msgstr ""
+msgstr "esci subito dopo l'annuncio iniziale del riferimento"
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
+"non provare a utilizzare <directory>/.git/ se <directory> non è una "
+"directory Git"
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
+msgstr "interrompi il trasferimento dopo <n> secondi di inattività"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
+msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:76
-#, fuzzy
+#: builtin/verify-commit.c:68
msgid "print commit contents"
-msgstr "Commit iniziale su "
+msgstr "stampa i contenuti del commit"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
-msgstr ""
+msgstr "stampa l'output grezzo dello stato di GPG"
#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
#: builtin/verify-pack.c:65
-#, fuzzy
msgid "verbose"
msgstr "dettagliato"
#: builtin/verify-pack.c:67
msgid "show statistics only"
-msgstr ""
+msgstr "visualizza solo le statistiche"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
-msgstr ""
+msgstr "stampa i contenuti del tag"
#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr ""
+msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]"
#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
-msgstr ""
+msgstr "git worktree list [<opzioni>]"
#: builtin/worktree.c:20
-#, fuzzy
msgid "git worktree lock [<options>] <path>"
-msgstr "git apply [opzioni] [<patch>...]"
+msgstr "git worktree lock [<opzioni>] <percorso>"
#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
-msgstr ""
+msgstr "git worktree move <albero di lavoro> <nuovo percorso>"
#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
-msgstr ""
+msgstr "git worktree prune [<opzioni>]"
#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
-msgstr ""
+msgstr "git worktree remove [<opzioni>] <albero di lavoro>"
#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
-msgstr ""
+msgstr "git worktree unlock <percorso>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
-#, fuzzy, c-format
+#: builtin/worktree.c:61 builtin/worktree.c:899
+#, c-format
msgid "failed to delete '%s'"
-msgstr "apertura di '%s' non riuscita"
+msgstr "eliminazione di '%s' non riuscita"
#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
-msgstr ""
+msgstr "Rimuovo worktrees/%s: non è una directory valida"
#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr ""
+msgstr "Rimuovo worktrees/%s: il file gitdir non esiste"
#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
+msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
#: builtin/worktree.c:110
#, c-format
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
+"Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, "
+"%<PRIuMAX> letti)"
#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr ""
+msgstr "Rimuovo worktrees/%s: file gitdir non valido"
#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
+msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente"
#: builtin/worktree.c:166
msgid "report pruned working trees"
-msgstr ""
+msgstr "segnala gli alberi di lavoro eliminati"
#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
-msgstr ""
+msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>"
#: builtin/worktree.c:235
-#, fuzzy, c-format
+#, c-format
msgid "'%s' already exists"
-msgstr "%s esiste già"
+msgstr "'%s' esiste già"
#: builtin/worktree.c:252
-#, fuzzy, c-format
+#, c-format
msgid "unable to re-add worktree '%s'"
-msgstr "impossibile leggere il tree (%s)"
+msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'"
#: builtin/worktree.c:257
#, c-format
"'%s' is a missing but locked worktree;\n"
"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
+"'%s' è un albero di lavoro mancante ma bloccato;\n"
+"usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per "
+"rimuoverlo"
#: builtin/worktree.c:259
#, c-format
"'%s' is a missing but already registered worktree;\n"
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
+"'%s' è un albero di lavoro mancante ma già registrato;\n"
+"usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo"
-#: builtin/worktree.c:302
-#, fuzzy, c-format
+#: builtin/worktree.c:309
+#, c-format
msgid "could not create directory of '%s'"
-msgstr "Non è stato possibile creare la directory '%s'"
+msgstr "impossibile creare la directory di '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
-#, fuzzy, c-format
+#: builtin/worktree.c:440 builtin/worktree.c:446
+#, c-format
msgid "Preparing worktree (new branch '%s')"
-msgstr "Errore nella rimozione del branch '%s'"
+msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
+"Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a "
+"%s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
-msgstr ""
+msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
-msgstr ""
+msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
+"esegui il checkout di <branch> anche se tale operazione è stata eseguita in "
+"un altro albero di lavoro"
-#: builtin/worktree.c:493
-#, fuzzy
+#: builtin/worktree.c:501
msgid "create a new branch"
-msgstr "[nuovo branch]"
+msgstr "crea un nuovo branch"
-#: builtin/worktree.c:495
-#, fuzzy
+#: builtin/worktree.c:503
msgid "create or reset a branch"
-msgstr "Elenca, crea o elimina branch"
+msgstr "crea o reimposta un branch"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
-msgstr ""
+msgstr "popola il nuovo albero di lavoro"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
-msgstr ""
+msgstr "mantieni bloccato il nuovo albero di lavoro"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
-msgstr ""
+msgstr "imposta la modalità tracking (vedi git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
+"tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch "
+"remoto da tracciare"
-#: builtin/worktree.c:512
-#, fuzzy
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-A e -u sono reciprocamente incompatibili"
+msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
+"l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
-msgstr ""
+msgstr "motivo di blocco"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
-#, fuzzy, c-format
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
+#, c-format
msgid "'%s' is not a working tree"
-msgstr "'%s' non è un commit"
+msgstr "'%s' non è un albero di lavoro"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
-msgstr ""
+msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
-msgstr ""
+msgstr "'%s' è già bloccato per questo motivo: %s"
-#: builtin/worktree.c:694
-#, fuzzy, c-format
+#: builtin/worktree.c:702
+#, c-format
msgid "'%s' is already locked"
-msgstr "il tag '%s' esiste già"
+msgstr "'%s' è già bloccato"
-#: builtin/worktree.c:722
-#, fuzzy, c-format
+#: builtin/worktree.c:730
+#, c-format
msgid "'%s' is not locked"
-msgstr "'%s' non è un commit"
+msgstr "'%s' non è bloccato"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
+"gli alberi di lavoro contenenti sottomoduli non possono essere spostati o "
+"rimossi"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
-msgstr ""
+msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
-msgstr ""
+msgstr "'%s' è un albero di lavoro principale"
-#: builtin/worktree.c:799
-#, fuzzy, c-format
+#: builtin/worktree.c:807
+#, c-format
msgid "could not figure out destination name from '%s'"
-msgstr "Non è stato possibile leggere da '%s'"
+msgstr "impossibile determinare il nome destinazione da '%s'"
-#: builtin/worktree.c:805
-#, fuzzy, c-format
+#: builtin/worktree.c:813
+#, c-format
msgid "target '%s' already exists"
-msgstr "il tag '%s' esiste già"
+msgstr "la destinazione '%s' esiste già"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
+"impossibile spostare un albero di lavoro bloccato, motivazione blocco: %s\n"
+"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
+"impossibile spostare un albero di lavoro bloccato;\n"
+"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
-msgstr ""
+msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s"
-#: builtin/worktree.c:823
-#, fuzzy, c-format
+#: builtin/worktree.c:831
+#, c-format
msgid "failed to move '%s' to '%s'"
-msgstr "impossibile spostare %s in %s"
+msgstr "spostamento di '%s' in '%s' non riuscito"
-#: builtin/worktree.c:871
-#, fuzzy, c-format
+#: builtin/worktree.c:879
+#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr "stat di '%s' non riuscito"
+msgstr "esecuzione di 'git status' su '%s' non riuscita"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
-msgstr ""
+msgstr "'%s' è sporco, usa --force per eliminarlo"
-#: builtin/worktree.c:880
-#, fuzzy, c-format
+#: builtin/worktree.c:888
+#, c-format
msgid "failed to run 'git status' on '%s', code %d"
-msgstr "stat di '%s' non riuscito"
+msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
-msgstr ""
+msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
+"impossibile rimuovere un albero di lavoro bloccato, motivazione blocco: %s\n"
+"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
+"impossibile rimuovere un albero di lavoro bloccato;\n"
+"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
+"l'operazione"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
+msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
+msgstr "git write-tree [--missing-ok] [--prefix=<prefisso>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
-msgstr ""
+msgstr "<prefisso>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
+msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
-msgstr ""
+msgstr "utile solo per il debug"
#: credential-cache--daemon.c:223
#, c-format
"\n"
"\tchmod 0700 %s"
msgstr ""
+"I permessi sulla directory del socket sono troppo laschi; altri\n"
+"utenti potrebbero essere in grado di leggere le credenziali nella\n"
+"cache. Valuta di eseguire:\n"
+"\n"
+"\tchmod 0700 %s"
#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
-msgstr ""
+msgstr "stampa i messaggi di debug sullo standard error"
#: t/helper/test-reach.c:152
-#, fuzzy, c-format
+#, c-format
msgid "commit %s is not marked reachable"
-msgstr "il path '%s' non ha la nostra versione"
+msgstr "il commit %s non è contrassegnato come raggiungibile"
#: t/helper/test-reach.c:162
-#, fuzzy
msgid "too many commits marked reachable"
-msgstr "troppi commit da scrivere nel grafo"
+msgstr "troppi commit contrassegnati come raggiungibili"
#: t/helper/test-serve-v2.c:7
-#, fuzzy
msgid "test-tool serve-v2 [<options>]"
-msgstr "git apply [opzioni] [<patch>...]"
+msgstr "test-tool serve-v2 [<opzioni>]"
#: t/helper/test-serve-v2.c:19
msgid "exit immediately after advertising capabilities"
-msgstr ""
+msgstr "esci subito dopo aver annunciato le funzionalità"
#: git.c:27
msgid ""
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]"
msgstr ""
+"git [--version] [--help] [-C <percorso>] [-c <nome>=<valore>]\n"
+" [--exec-path[=<percorso>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<percorso>] [--work-tree=<percorso>] [--"
+"namespace=<nome>]\n"
+" <comando> [<argomenti>]"
#: git.c:34
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
+"'git help -a' e 'git help -g' elencano i sottocomandi disponibili e\n"
+"alcune guide concettuali. Vedi 'git help <comando>' o 'git help <concetto>'\n"
+"per leggere ulteriori informazioni su un sottocomando o su un concetto\n"
+"specifici.\n"
+"Vedi 'git help git' per una panoramica del sistema."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
-msgstr ""
+msgstr "nessuna directory specificata per --git-dir\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
-msgstr ""
+msgstr "nessuno spazio dei nomi specificato per --namespace\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
-msgstr ""
+msgstr "nessuna directory specificata per --work-tree\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
-msgstr ""
+msgstr "nessun prefisso specificato per --super-prefix\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
-msgstr ""
+msgstr "-c: attesa stringa di configurazione\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
-msgstr ""
+msgstr "nessuna directory specificata per -C\n"
-#: git.c:313
-#, fuzzy, c-format
+#: git.c:314
+#, c-format
msgid "unknown option: %s\n"
-msgstr "sconosciuto: %s"
+msgstr "opzione sconosciuta: %s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
-msgstr ""
+msgstr "durante l'espansione dell'alias '%s': '%s'"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
+"l'alias '%s' modifica le variabili d'ambiente.\n"
+"Puoi usare '!git' nell'alias per farlo"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
-msgstr ""
+msgstr "alias vuoto per %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
-msgstr ""
+msgstr "alias ricorsivo: %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
-msgstr ""
+msgstr "errore di scrittura sullo standard output"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
-msgstr ""
+msgstr "errore di scrittura sconosciuto sullo standard output"
-#: git.c:463
-#, fuzzy
+#: git.c:464
msgid "close failed on standard output"
-msgstr "riga configurazione %d errata nello standard input"
+msgstr "chiusura dello standard output non riuscita"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
+msgstr "rilevato ciclo alias: l'espansione di '%s' non termina:%s"
-#: git.c:847
-#, fuzzy, c-format
+#: git.c:843
+#, c-format
msgid "cannot handle %s as a builtin"
-msgstr "impossibile usare %s come file di esclusione"
+msgstr "impossibile gestire %s come comando incorporato"
-#: git.c:860
-#, fuzzy, c-format
+#: git.c:856
+#, c-format
msgid ""
"usage: %s\n"
"\n"
-msgstr "uso: %s"
+msgstr ""
+"uso: %s\n"
+"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
+msgstr "espansione dell'alias '%s' non riuscita; '%s' non è un comando Git\n"
-#: git.c:892
-#, fuzzy, c-format
+#: git.c:888
+#, c-format
msgid "failed to run command '%s': %s\n"
-msgstr "esecuzione di '%s' non riuscita: %s"
+msgstr "esecuzione del comando '%s' non riuscita: %s\n"
#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr ""
+msgstr "valore negativo per http.postbuffer; uso l'impostazione predefinita %d"
#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr ""
+msgstr "Il controllo delegazione non è supportato con cURL < 7.22.0"
#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr ""
+msgstr "Il pinning delle chiavi pubbliche non è supportato con cURL < 7.44.0"
#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr ""
+msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0"
#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
+msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4"
#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr ""
+msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
+"Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza "
+"backend SSL"
#: http.c:1096
-#, fuzzy, c-format
+#, c-format
msgid "Could not set SSL backend to '%s': already set"
-msgstr "Non è stato possibile rimuovere il branch %s"
+msgstr "Impossibile impostare il backend SSL a '%s': già impostato"
#: http.c:1965
#, c-format
" asked for: %s\n"
" redirect: %s"
msgstr ""
+"impossibile aggiornare l'URL di base dalla redirezione:\n"
+" richiesta: %s\n"
+" redirect: %s"
#: remote-curl.c:157
-#, fuzzy, c-format
+#, c-format
msgid "invalid quoting in push-option value: '%s'"
-msgstr "Valore di %s errato: '%s'"
+msgstr "virgolette non valide nel valore push-option: '%s'"
#: remote-curl.c:254
-#, fuzzy, c-format
+#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "'%s' non riconosciuto come repository Git"
+msgstr "%sinfo/refs non valido: è un repository Git?"
#: remote-curl.c:355
-#, fuzzy
msgid "invalid server response; expected service, got flush packet"
-msgstr "git archive: attesi ACK/NAK, ricevuto pacchetto di flush"
+msgstr ""
+"risposta del server non valida; atteso servizio, ricevuto pacchetto flush"
#: remote-curl.c:386
-#, fuzzy, c-format
+#, c-format
msgid "invalid server response; got '%s'"
-msgstr "responso ls-refs non valido: %s"
+msgstr "risposta del server non valida; ricevuto '%s'"
#: remote-curl.c:446
-#, fuzzy, c-format
+#, c-format
msgid "repository '%s' not found"
-msgstr "branch '%s' non trovato."
+msgstr "repository '%s' non trovato"
#: remote-curl.c:450
-#, fuzzy, c-format
+#, c-format
msgid "Authentication failed for '%s'"
-msgstr "valore mancante per %s"
+msgstr "Autenticazione non riuscita per '%s'"
#: remote-curl.c:454
-#, fuzzy, c-format
+#, c-format
msgid "unable to access '%s': %s"
-msgstr "impossibile accedere a '%s'"
+msgstr "impossibile accedere a '%s': %s"
#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
-msgstr ""
+msgstr "redirezione a %s in corso"
#: remote-curl.c:584
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
+"non dovrebbe esserci un pacchetto fine file se non si è accomodanti con "
+"questi ultimi"
#: remote-curl.c:664
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
+"impossibile ritornare a un punto precedente dei dati POST RPC - prova ad "
+"aumentare il valore di http.postBuffer"
#: remote-curl.c:724
-#, fuzzy, c-format
+#, c-format
msgid "RPC failed; %s"
-msgstr "non riuscito: %d"
+msgstr "RPC non riuscita; %s"
#: remote-curl.c:764
-#, fuzzy
msgid "cannot handle pushes this big"
-msgstr "impossibile usare %s come file di esclusione"
+msgstr "impossibile gestire push così grandi"
#: remote-curl.c:879
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
+"impossibile eseguire il deflate della richiesta; errore deflate zlib %d"
#: remote-curl.c:883
#, c-format
msgid "cannot deflate request; zlib end error %d"
-msgstr ""
+msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d"
#: remote-curl.c:1014
-#, fuzzy
msgid "dumb http transport does not support shallow capabilities"
-msgstr "Il server non supporta client shallow"
+msgstr "il trasporto http stupido non supporta le funzionalità shallow"
#: remote-curl.c:1028
-#, fuzzy
msgid "fetch failed."
-msgstr "esecuzione di stash non riuscita"
+msgstr "recupero non riuscito."
#: remote-curl.c:1076
msgid "cannot fetch by sha1 over smart http"
msgstr ""
+"impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP "
+"intelligente"
#: remote-curl.c:1120 remote-curl.c:1126
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'"
+msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'"
#: remote-curl.c:1138 remote-curl.c:1252
-#, fuzzy, c-format
+#, c-format
msgid "http transport does not support %s"
-msgstr "la variante SSH 'simple' non supporta -4"
+msgstr "il trasporto HTTP non supporta %s"
#: remote-curl.c:1174
-#, fuzzy
msgid "git-http-push failed"
-msgstr "esecuzione di stash non riuscita"
+msgstr "git-http-push non riuscito"
#: remote-curl.c:1360
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
+msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]"
#: remote-curl.c:1392
msgid "remote-curl: error reading command stream from git"
-msgstr ""
+msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git"
#: remote-curl.c:1399
msgid "remote-curl: fetch attempted without a local repo"
-msgstr ""
+msgstr "remote-curl: tentato un fetch senza un repository locale"
#: remote-curl.c:1439
#, c-format
msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
+msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git"
#: list-objects-filter-options.h:61
msgid "args"
-msgstr ""
+msgstr "argomenti"
#: list-objects-filter-options.h:62
msgid "object filtering"
-msgstr ""
+msgstr "filtraggio oggetti"
#: parse-options.h:170
msgid "expiry-date"
-msgstr ""
+msgstr "data-scadenza"
#: parse-options.h:184
msgid "no-op (backward compatibility)"
-msgstr ""
+msgstr "no-op (retrocompatibilità)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
-msgstr "più dettagliato"
+msgstr "visualizza più dettagli"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
-msgstr "meno dettagliato"
+msgstr "visualizza meno dettagli"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
-msgstr "usare <n> cifre per mostrare gli hash SHA-1"
+msgstr "usa <n> cifre per mostrare gli hash SHA-1"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "come rimuovere gli spazi e i #commenti dal messaggio"
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
+"aggiorna l'indice con la tecnica di risoluzione conflitti riutilizzata se "
+"possibile"
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD scollegato su "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD scollegato da "
#: command-list.h:50
msgid "Add file contents to the index"
-msgstr "Aggiunge il contenuto del file a index"
+msgstr "Aggiunge i contenuti del file all'indice"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
-msgstr ""
+msgstr "Applica una serie di patch da una casella di posta"
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr ""
+msgstr "Annota le righe dei file con le informazioni sui commit"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
-msgstr ""
+msgstr "Applica una patch ai file e/o all'indice"
#: command-list.h:54
-#, fuzzy
msgid "Import a GNU Arch repository into Git"
-msgstr "Clona un repository in una nuova directory"
+msgstr "Importa un repository GNU Arch in Git"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
-msgstr ""
+msgstr "Crea un archivio di file da un albero con nome"
#: command-list.h:56
-#, fuzzy
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Cerca mediante ricerca binaria la modifica che ha introdotto un bug"
+msgstr "Usa la ricerca binaria per trovare il commit che ha introdotto un bug"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
msgstr ""
+"Visualizza quali revisione e autore hanno modificato ogni singola riga di un "
+"file per ultimi"
#: command-list.h:58
msgid "List, create, or delete branches"
#: command-list.h:59
msgid "Move objects and refs by archive"
-msgstr ""
+msgstr "Sposta oggetti e riferimenti in base a un archivio"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr ""
+"Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gli "
+"oggetti di un repository"
#: command-list.h:61
msgid "Display gitattributes information"
-msgstr ""
+msgstr "Visualizza le informazioni sugli attributi Git"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
-msgstr ""
+msgstr "Esegui il debug dei file gitignore/escludi file"
#: command-list.h:63
msgid "Show canonical names and email addresses of contacts"
-msgstr ""
+msgstr "Visualizza i nomi canonici e gli indirizzi e-mail dei contatti"
#: command-list.h:64
msgid "Switch branches or restore working tree files"
msgstr ""
+"Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
#: command-list.h:65
msgid "Copy files from the index to the working tree"
-msgstr ""
+msgstr "Copia dei file dall'indice all'albero di lavoro"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
-msgstr ""
+msgstr "Si assicura che un nome riferimento sia ben formato"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
-msgstr ""
+msgstr "Trova commit che devono essere ancora applicati upstream"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
-msgstr ""
+msgstr "Applica le modifiche introdotte da alcuni commit esistenti"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
-msgstr ""
+msgstr "Alternativa grafica a git-commit"
#: command-list.h:70
msgid "Remove untracked files from the working tree"
-msgstr ""
+msgstr "Rimuove i file non tracciati dall'albero di lavoro"
#: command-list.h:71
msgid "Clone a repository into a new directory"
#: command-list.h:72
msgid "Display data in columns"
-msgstr ""
+msgstr "Visualizza i dati in colonne"
#: command-list.h:73
msgid "Record changes to the repository"
-msgstr "Registra modifiche nel repository"
+msgstr "Registra modifiche al repository"
#: command-list.h:74
msgid "Write and verify Git commit-graph files"
-msgstr ""
+msgstr "Scrive e verifica i file grafo dei commit di Git"
#: command-list.h:75
-#, fuzzy
msgid "Create a new commit object"
-msgstr "scrittura dell'oggetto di commit non riuscita"
+msgstr "Crea un nuovo oggetto commit"
#: command-list.h:76
msgid "Get and set repository or global options"
-msgstr ""
+msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
+"Conta il numero di oggetti non in un pack e la loro occupazione di spazio su "
+"disco"
#: command-list.h:78
msgid "Retrieve and store user credentials"
-msgstr ""
+msgstr "Recupera e salva credenziali utente"
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
-msgstr ""
+msgstr "Helper per salvare temporaneamente password in memoria"
#: command-list.h:80
msgid "Helper to store credentials on disk"
-msgstr ""
+msgstr "Helper per salvare credenziali su disco"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
-msgstr ""
+msgstr "Esporta un singolo commit in un checkout CVS"
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
+"Recupera i dati da un sistema di controllo di versione che le persone "
+"adorano odiare"
#: command-list.h:83
msgid "A CVS server emulator for Git"
-msgstr ""
+msgstr "Un emulatore di server CVS per Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
-msgstr ""
+msgstr "Un server veramente semplice per repository Git"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
msgstr ""
+"Attribuisce un nome leggibile a un oggetto basandosi su un riferimento "
+"disponibile"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
+"Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc."
#: command-list.h:87
-#, fuzzy
msgid "Compares files in the working tree and the index"
-msgstr "git %s: lettura di index non riuscita"
+msgstr "Confronta file nell'albero di lavoro e nell'indice"
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
-msgstr ""
+msgstr "Confronta un albero con l'albero di lavoro o l'indice"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
+"Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
#: command-list.h:90
msgid "Show changes using common diff tools"
msgstr ""
+"Visualizza le modifiche usando tool comuni per la visualizzazione dei diff"
#: command-list.h:91
msgid "Git data exporter"
-msgstr ""
+msgstr "Esportatore di dati Git"
#: command-list.h:92
msgid "Backend for fast Git data importers"
-msgstr ""
+msgstr "Backend per importatori di dati Git veloci"
#: command-list.h:93
msgid "Download objects and refs from another repository"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgstr "Scarica oggetti e riferimenti da un altro repository"
#: command-list.h:94
-#, fuzzy
msgid "Receive missing objects from another repository"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgstr "Riceve oggetti mancanti da un altro repository"
#: command-list.h:95
-#, fuzzy
msgid "Rewrite branches"
-msgstr " Branch remoto:%s"
+msgstr "Riscrive branch"
#: command-list.h:96
-#, fuzzy
msgid "Produce a merge commit message"
-msgstr "non è stato possibile leggere il messaggio di commit: %s"
+msgstr "Genera un messaggio di commit del merge"
#: command-list.h:97
msgid "Output information on each ref"
-msgstr ""
+msgstr "Visualizza in output le informazioni su ogni riferimento"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
-msgstr ""
+msgstr "Prepara patch per il loro invio tramite e-mail"
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr ""
+msgstr "Verifica la connessione e la validità degli oggetti nel database"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "Ripulisce file non necessari e ottimizza il repository locale"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
+msgstr "Estrae l'ID del commit da un archivio creato usando git-archive"
#: command-list.h:102
msgid "Print lines matching a pattern"
-msgstr "Stampa le righe corrispondenti ad un modello"
+msgstr "Stampa le righe corrispondenti a un'espressione regolare"
#: command-list.h:103
msgid "A portable graphical interface to Git"
-msgstr ""
+msgstr "Un'interfaccia grafica portabile per Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
+msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
#: command-list.h:105
msgid "Display help information about Git"
-msgstr ""
+msgstr "Visualizza una guida a Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "Implementazione lato server di Git su HTTP"
#: command-list.h:107
-#, fuzzy
msgid "Download from a remote Git repository via HTTP"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgstr "Scarica dati da un repository Git remoto tramite HTTP"
#: command-list.h:108
-#, fuzzy
msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
+msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP"
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
-msgstr ""
+msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack"
#: command-list.h:111
-#, fuzzy
msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un repository git vuoto o reinizializza uno esistente"
+msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
-msgstr ""
+msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
#: command-list.h:113
msgid "Add or parse structured information in commit messages"
-msgstr ""
+msgstr "Aggiunge o analizza informazioni strutturate nei messaggi di commit"
#: command-list.h:114
-#, fuzzy
msgid "The Git repository browser"
-msgstr "%s%s repository Git in %s%s\n"
+msgstr "Il browser per i repository Git"
#: command-list.h:115
msgid "Show commit logs"
-msgstr "Mostra log del commit"
+msgstr "Visualizza i log dei commit"
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
-msgstr ""
+msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
#: command-list.h:117
-#, fuzzy
msgid "List references in a remote repository"
-msgstr "%s reset non è consentito in un repository spoglio"
+msgstr "Elenca i riferimenti in un repository remoto"
#: command-list.h:118
msgid "List the contents of a tree object"
-msgstr ""
+msgstr "Elenca i contenuti di un oggetto albero"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
+"Estrae la patch e le informazioni sull'autore da un singolo messaggio e-mail"
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
-msgstr ""
+msgstr "Un semplice programma per suddividere i file UNIX mbox"
#: command-list.h:121
msgid "Join two or more development histories together"
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
-msgstr ""
+msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
#: command-list.h:123
msgid "Run a three-way file merge"
-msgstr ""
+msgstr "Esegue un merge a tre vie su file"
#: command-list.h:124
msgid "Run a merge for files needing merging"
-msgstr ""
+msgstr "Esegue un merge per i file che lo richiedono"
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
-msgstr ""
+msgstr "Il programma helper standard da usare con git-merge-index"
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
+"Esegue gli strumenti di risoluzione conflitti di merge per risolvere i "
+"conflitti di merge"
#: command-list.h:127
msgid "Show three-way merge without touching index"
-msgstr ""
+msgstr "Visualizza un merge a tre vie senza modificare l'indice"
#: command-list.h:128
msgid "Write and verify multi-pack-indexes"
-msgstr ""
+msgstr "Scrive e verifica indici multi-pack"
#: command-list.h:129
msgid "Creates a tag object"
-msgstr ""
+msgstr "Crea un oggetto tag"
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
+msgstr "Genera un oggetto albero da testo in formato ls-tree"
#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Sposta o rinomina un file, una directory o un link simbolico"
+msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
#: command-list.h:132
msgid "Find symbolic names for given revs"
-msgstr ""
+msgstr "Trova i nomi simbolici per le revisioni date"
#: command-list.h:133
msgid "Add or inspect object notes"
-msgstr ""
+msgstr "Aggiunge o esamina le note agli oggetti"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
-msgstr ""
+msgstr "Importa dati da, o invia dati a, repository Perforce"
#: command-list.h:135
msgid "Create a packed archive of objects"
-msgstr ""
+msgstr "Crea un archivio di oggetti sottoposto a pack"
#: command-list.h:136
msgid "Find redundant pack files"
-msgstr ""
+msgstr "Trova file pack ridondanti"
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
-msgstr ""
+msgstr "Esegue il pack di head e tag per un accesso efficiente al repository"
#: command-list.h:138
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
+"Routine che aiutano ad analizzare i parametri di accesso ai repository remoti"
#: command-list.h:139
msgid "Compute unique ID for a patch"
-msgstr ""
+msgstr "Calcola l'ID univoco per una patch"
#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
-msgstr ""
+msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
#: command-list.h:141
msgid "Remove extra objects that are already in pack files"
-msgstr ""
+msgstr "Rimuove gli oggetti aggiuntivi già presenti nei file pack"
#: command-list.h:142
-#, fuzzy
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Combina fetche + merge da un altro repository o un branch locale"
+msgstr ""
+"Esegue il fetch e l'integrazione con un altro repository o un branch locale"
#: command-list.h:143
msgid "Update remote refs along with associated objects"
-msgstr "Aggiorna i ref remoti insieme agli oggetti associati"
+msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
#: command-list.h:144
-#, fuzzy
msgid "Applies a quilt patchset onto the current branch"
-msgstr "Nessun upstream di default definito per il branch corrente."
+msgstr "Applica un insieme di patch quilt sul branch corrente"
#: command-list.h:145
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
+msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)"
#: command-list.h:146
msgid "Reads tree information into the index"
-msgstr ""
+msgstr "Legge le informazioni su un albero dall'indice"
#: command-list.h:147
msgid "Reapply commits on top of another base tip"
-msgstr ""
+msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
#: command-list.h:148
-#, fuzzy
msgid "Receive what is pushed into the repository"
-msgstr "Registra modifiche nel repository"
+msgstr "Riceve quanto sottoposto a push nel repository"
#: command-list.h:149
msgid "Manage reflog information"
-msgstr ""
+msgstr "Gestisce le informazioni del registro dei riferimenti"
#: command-list.h:150
-#, fuzzy
msgid "Manage set of tracked repositories"
-msgstr "Registra modifiche nel repository"
+msgstr "Gestisce l'insieme dei repository tracciati"
#: command-list.h:151
-#, fuzzy
msgid "Pack unpacked objects in a repository"
-msgstr "--cached al di fuori di un repository"
+msgstr "Esegue il pack degli oggetti non sottoposti a pack in un repository"
#: command-list.h:152
-#, fuzzy
msgid "Create, list, delete refs to replace objects"
-msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
+msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
#: command-list.h:153
msgid "Generates a summary of pending changes"
-msgstr ""
+msgstr "Genera un riassunto delle modifiche in sospeso"
#: command-list.h:154
msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "Ripristina l'HEAD corrente allo stato specificato"
#: command-list.h:156
-#, fuzzy
-msgid "Revert some existing commits"
-msgstr "Impossibile eseguire il revert come commit iniziale"
+msgid "Restore working tree files"
+msgstr "Ripristina i file nell'albero di lavoro"
#: command-list.h:157
-msgid "Lists commit objects in reverse chronological order"
-msgstr ""
+msgid "Revert some existing commits"
+msgstr "Esegue il revert di alcuni commit esistenti"
#: command-list.h:158
-#, fuzzy
-msgid "Pick out and massage parameters"
-msgstr "troppi parametri"
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
#: command-list.h:159
-msgid "Remove files from the working tree and from the index"
-msgstr ""
+msgid "Pick out and massage parameters"
+msgstr "Sceglie e altera i parametri"
#: command-list.h:160
-msgid "Send a collection of patches as emails"
-msgstr ""
+msgid "Remove files from the working tree and from the index"
+msgstr "Rimuove file dall'albero di lavoro e dall'indice"
#: command-list.h:161
-#, fuzzy
-msgid "Push objects over Git protocol to another repository"
-msgstr "Scarica oggetti e ref da un altro repository"
+msgid "Send a collection of patches as emails"
+msgstr "Invia un insieme di patch come e-mail"
#: command-list.h:162
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
+"Esegue il push di oggetti su un altro repository tramite il protocollo Git"
#: command-list.h:163
-msgid "Summarize 'git log' output"
-msgstr ""
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Shell di login limitata per concedere accesso SSH solo per Git"
#: command-list.h:164
-msgid "Show various types of objects"
-msgstr "Mostra vari tipi di oggetti"
+msgid "Summarize 'git log' output"
+msgstr "Riassume l'output di 'git log'"
#: command-list.h:165
-#, fuzzy
-msgid "Show branches and their commits"
-msgstr "nessuna modifica aggiunta al commit%s\n"
+msgid "Show various types of objects"
+msgstr "Visualizza vari tipi di oggetti"
#: command-list.h:166
-msgid "Show packed archive index"
-msgstr ""
+msgid "Show branches and their commits"
+msgstr "Visualizza i branch e i loro commit"
#: command-list.h:167
-#, fuzzy
-msgid "List references in a local repository"
-msgstr "il repository di riferimento '%s' non è una directory locale."
+msgid "Show packed archive index"
+msgstr "Visualizza l'indice di un archivio sottoposto a pack"
#: command-list.h:168
-msgid "Git's i18n setup code for shell scripts"
-msgstr ""
+msgid "List references in a local repository"
+msgstr "Elenca i riferimenti in un repository locale"
#: command-list.h:169
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
+"Codice di inizializzazione dell'internazionalizzazione di Git per gli script "
+"shell"
#: command-list.h:170
-#, fuzzy
-msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: esiste già nella directory di lavoro"
+msgid "Common Git shell script setup code"
+msgstr "Codice comune di inizializzazione di Git per gli script shell"
#: command-list.h:171
-#, fuzzy
-msgid "Add file contents to the staging area"
-msgstr "Aggiunge il contenuto del file a index"
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
#: command-list.h:172
-msgid "Show the working tree status"
-msgstr ""
+msgid "Add file contents to the staging area"
+msgstr "Aggiunge i contenuti dei file all'area di staging"
#: command-list.h:173
-msgid "Remove unnecessary whitespace"
-msgstr ""
+msgid "Show the working tree status"
+msgstr "Visualizza lo stato dell'albero di lavoro"
#: command-list.h:174
-msgid "Initialize, update or inspect submodules"
-msgstr ""
+msgid "Remove unnecessary whitespace"
+msgstr "Rimuove spazi bianchi non necessari"
#: command-list.h:175
-msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
+msgid "Initialize, update or inspect submodules"
+msgstr "Inizializza, aggiorna o esamina sottomoduli"
#: command-list.h:176
-msgid "Read, modify and delete symbolic refs"
-msgstr ""
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Operatività bidirezionale tra un repository Subversion e Git"
#: command-list.h:177
+msgid "Switch branches"
+msgstr "Passa da un branch a un altro"
+
+#: command-list.h:178
+msgid "Read, modify and delete symbolic refs"
+msgstr "Legge, modifica ed elimina riferimenti simbolici"
+
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
-msgstr ""
+msgstr "Crea un file temporaneo con i contenuti di un blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
-msgstr ""
+msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
-#: command-list.h:180
-#, fuzzy
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
-msgstr "Aggiunge il contenuto del file a index"
+msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
-msgstr ""
+msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
-msgstr ""
+msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
-msgstr ""
+msgstr "Reinvia l'archivio a git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
+msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
-msgstr ""
+msgstr "Visualizza una variabile logica di Git"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
-msgstr ""
+msgstr "Verifica la firma GPG dei commit"
-#: command-list.h:187
-#, fuzzy
+#: command-list.h:189
msgid "Validate packed Git archive files"
-msgstr "non è stato possibile creare il file del repository '%s'"
+msgstr "Convalida i file archivio sottoposti a pack di Git"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
-msgstr ""
+msgstr "Verifica la firma GPG dei tag"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
+msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr ""
+"Visualizza i registri insieme alle differenze introdotte da ciascun commit"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
-msgstr ""
+msgstr "Gestisce alberi di lavoro multipli"
-#: command-list.h:192
-#, fuzzy
+#: command-list.h:194
msgid "Create a tree object from the current index"
-msgstr "assicura che la patch sia applicabile all'attuale index"
+msgstr "Crea un oggetto albero dall'indice corrente"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
-msgstr ""
+msgstr "Definizione di attributi per percorso"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
-msgstr ""
+msgstr "Interfaccia a riga di comando di Git e convenzioni"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
-msgstr ""
+msgstr "Un tutorial Git di base per gli sviluppatori"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
-msgstr ""
+msgstr "Git per utenti CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
-msgstr ""
+msgstr "Messa a punto dell'output di diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
+msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
-msgstr ""
+msgstr "Un glossario di Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
-msgstr ""
+msgstr "Hook usati da Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
+msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
-msgstr ""
+msgstr "Definizione proprietà sottomodulo"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
-msgstr ""
+msgstr "Spazi dei nomi Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
-msgstr ""
+msgstr "Struttura repository Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
-msgstr ""
+msgstr "Come specificare revisioni e intervalli in Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
-msgstr ""
+msgstr "Un tutorial introduttivo per Git: seconda parte"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
-msgstr ""
+msgstr "Un tutorial introduttivo per Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
-msgstr ""
+msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
-msgstr ""
+msgstr "Revisione fornita non valida: $arg"
#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
-msgstr ""
+msgstr "Revisione fornita non valida: $bisected_head"
#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
-msgstr ""
+msgstr "Revisione fornita non valida: $rev"
#: git-bisect.sh:139
-#, fuzzy, sh-format
+#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect bad' può prendere un solo argomento."
+msgstr "'git bisect $TERM_BAD' richiede un solo argomento."
#: git-bisect.sh:209
msgid "No logfile given"
#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
-msgstr ""
+msgstr "impossibile leggere $file per rieseguire i comandi contenuti"
#: git-bisect.sh:232
msgid "?? what are you talking about?"
-msgstr "?? di cosa si sta parlando?"
+msgstr "?? di cosa stai parlando?"
#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
-msgstr ""
+msgstr "esecuzione di bisect non riuscita: nessun comando fornito."
#: git-bisect.sh:246
#, sh-format
msgid "running $command"
-msgstr "sto eseguendo $command"
+msgstr "esecuzione di $command in corso"
#: git-bisect.sh:253
#, sh-format
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-"bisect run non riuscito:\n"
+"esecuzione di bisect non riuscita:\n"
"il codice di uscita $res da '$command' è < 0 oppure >= 128"
#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
-msgstr "bisect run non può più proseguire"
+msgstr "l'esecuzione di bisect non può più proseguire"
#: git-bisect.sh:285
#, sh-format
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-"bisect run non riuscito:\n"
-"bisect_state $state è uscito con il codice di errore $res"
+"esecuzione di bisect non riuscita:\n"
+"'bisect_state $state' è uscito con il codice di errore $res"
#: git-bisect.sh:292
msgid "bisect run success"
-msgstr "bisect run eseguito con successo"
+msgstr "esecuzione di bisect completata con successo"
#: git-bisect.sh:300
msgid "We are not bisecting."
-msgstr "Non stiamo eseguendo un bisect."
+msgstr "Non stiamo eseguendo una bisezione."
#: git-merge-octopus.sh:46
-#, fuzzy
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
-msgstr "Le tue modifiche locali verranno sovrascritte da revert."
+msgstr ""
+"Errore: le tue modifiche locali ai seguenti file sarebbero sovrascritte dal "
+"merge"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
-msgstr ""
+msgstr "Il merge automatico non ha funzionato."
#: git-merge-octopus.sh:62
-#, fuzzy
msgid "Should not be doing an octopus."
-msgstr "non è stato possibile redirigere l'output"
+msgstr "Non dovrebbe essere eseguito un merge octopus."
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
-msgstr ""
+msgstr "Impossibile trovare un commit comune con $pretty_name"
#: git-merge-octopus.sh:77
#, sh-format
msgid "Already up to date with $pretty_name"
-msgstr ""
+msgstr "Già aggiornato rispetto a $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
-msgstr ""
+msgstr "Eseguo il fast forward a: $pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
-msgstr ""
+msgstr "Provo un merge semplice con $pretty_name"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
-msgstr ""
+msgstr "Il merge semplice non ha funzionato, provo il merge automatico."
#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
-msgstr ""
+msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)"
#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
-msgstr ""
+msgstr "Impossibile aggiornare $ref_stash con $w_commit"
#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
-msgstr ""
+msgstr "errore: opzione sconosciuta per 'stash push': $option"
#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
-msgstr ""
+msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
-msgstr ""
+msgstr "opzione sconosciuta: $opt"
#: git-legacy-stash.sh:555
#, sh-format
msgstr "Troppe revisioni specificate: $REV"
#: git-legacy-stash.sh:570
-#, fuzzy, sh-format
+#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference non è un riferimento valido"
#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
-msgstr "'$args' non è un referimento a uno stash"
+msgstr "'$args' non è un riferimento a uno stash"
#: git-legacy-stash.sh:617
msgid "unable to refresh index"
-msgstr "impossibile aggiornare index"
+msgstr "impossibile aggiornare l'indice"
#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
#: git-legacy-stash.sh:631
msgid "Could not save index tree"
-msgstr ""
+msgstr "Non è stato possibile salvare l'albero indice"
#: git-legacy-stash.sh:640
-#, fuzzy
msgid "Could not restore untracked files from stash entry"
-msgstr "non è stato possibile leggere il log dallo standard input"
+msgstr ""
+"Non è stato possibile ripristinare i file non tracciati dalla voce stash"
#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
-msgstr ""
+msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging"
#: git-legacy-stash.sh:703
#, sh-format
#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
+"Il percorso relativo può essere usato solo dal primo livello dell'albero di "
+"lavoro"
#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' deve essere assoluto o iniziare con ./|../"
+msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../"
#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' esiste già in index"
+msgstr "'$sm_path' esiste già nell'indice"
#: git-submodule.sh:232
-#, fuzzy, sh-format
+#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' esiste già in index"
+msgstr "'$sm_path' esiste già nell'indice e non è un sottomodulo"
#: git-submodule.sh:239
-#, fuzzy, sh-format
+#, sh-format
msgid "'$sm_path' does not have a commit checked out"
-msgstr "il percorso '%s' non ha la loro versione"
+msgstr "'$sm_path' non ha un commit di cui è stato eseguito il checkout"
#: git-submodule.sh:245
#, sh-format
"$sm_path\n"
"Use -f if you really want to add it."
msgstr ""
-"Il seguente path è ignorato da uno dei tuoi file .gitignore:\n"
+"Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n"
"$sm_path\n"
"Usa -f se vuoi davvero aggiungerlo."
#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr ""
+msgstr "Aggiunta del repository esistente in '$sm_path' all'indice"
#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' esiste già e non è un repository git valido"
+msgstr "'$sm_path' esiste già e non è un repository Git valido"
#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
+"È stata trovata localmente una directory Git per '$sm_name' con i seguenti "
+"remoti:"
#: git-submodule.sh:280
#, sh-format
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
+"Se vuoi riusare questa directory Git locale anziché clonarla nuovamente da\n"
+" $realrepo\n"
+"usa l'opzione '--force'. Se la directory Git locale non è il repository\n"
+"corretto, o se non sei sicuro di ciò che questo voglia dire, scegli un "
+"altro\n"
+"nome con l'opzione '--name'."
#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
+msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'."
#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
-msgstr ""
+msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'"
#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
-msgstr ""
+msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
-msgstr ""
+msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
+"Impossibile trovare la revisione corrente nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr ""
+msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'"
#: git-submodule.sh:588
#, sh-format
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
+"Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
+"percorso del sottomodulo '$sm_path'"
#: git-submodule.sh:606
#, sh-format
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
+"Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
+"provo a recuperare direttamente $sha1:"
#: git-submodule.sh:612
#, sh-format
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
+"Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva "
+"$sha1. Fetch diretto di tale commit non riuscito."
#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
+"Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
+msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'"
#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
+"Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
+msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'"
#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
+"Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
+msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'"
#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
+"Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo "
+"'$displaypath'"
#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
+msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr ""
+msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita"
#: git-submodule.sh:830
-#, fuzzy
msgid "The --cached option cannot be used with the --files option"
-msgstr "--cached non può essere usata con --files"
+msgstr "L'opzione --cached non può essere usata con l'opzione --files"
#: git-submodule.sh:882
#, sh-format
msgstr "modalità $mod_dst inattesa"
#: git-submodule.sh:902
-#, fuzzy, sh-format
+#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Attenzione: $name non contiene commit $sha1_src"
+msgstr " Attenzione: $display_name non contiene il commit $sha1_src"
#: git-submodule.sh:905
-#, fuzzy, sh-format
+#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Attenzione: $name non contiene commit $sha1_dst"
+msgstr " Attenzione: $display_name non contiene il commit $sha1_dst"
#: git-submodule.sh:908
-#, fuzzy, sh-format
+#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " Attenzione: $name non contiene commit $sha1_src e $sha1_dst"
+msgstr ""
+" Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst"
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
-msgstr ""
+msgstr "Vedi git-${cmd}(1) per ulteriori dettagli."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Stash automatico applicato."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Impossibile memorizzare $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
-msgstr ""
+msgstr "Rebase in corso ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
+"\n"
+"Comandi:\n"
+"p, pick <commit> = usa il commit\n"
+"r, reword <commit> = usa il commit, ma modifica il messaggio di commit\n"
+"e, edit <commit> = usa il commit, ma fermati per modificarlo\n"
+"s, squash <commit> = usa il commit, ma fondilo con il commit precedente\n"
+"f, fixup <commit> = come \"squash\", ma scarta il messaggio di log di "
+"questo\n"
+" commit\n"
+"x, exec <comando> = esegui il comando (il resto della riga) usando la shell\n"
+"d, drop <commit> = elimina il commit\n"
+"l, label <etichetta> = etichetta l'HEAD corrente con un nome\n"
+"t, reset <etichetta> = reimposta HEAD a un'etichetta\n"
+"m, merge [-C <commit> | -c <commit>] <etichetta> [# <oneline>]\n"
+". crea un commit di merge usando il messaggio del commit di merge\n"
+". originale (o la oneline se non è stato specificato un commit di "
+"merge\n"
+". originale). Usa -c <commit> per riformulare il messaggio di commit.\n"
+"\n"
+"Queste righe possono essere riordinate; saranno eseguite dalla prima "
+"all'ultima.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
msgstr ""
+"È possibile modificare il commit ora con\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Quando sei soddisfatto delle modifiche, esegui\n"
+"\n"
+"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
-msgstr ""
+msgstr "$sha1: non è un commit che possa essere scelto"
-#: git-rebase--preserve-merges.sh:279
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:334
+#, sh-format
msgid "Invalid commit name: $sha1"
-msgstr "commit non valido: %s"
+msgstr "Nome commit non valido: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
+"Impossibile scrivere lo SHA1 del commit che dovrebbe sostituire quello "
+"corrente"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
-msgstr ""
+msgstr "Fast forward a $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
-msgstr ""
+msgstr "Impossibile eseguire il fast forward a $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
-msgstr ""
+msgstr "Impossibile spostare l'HEAD a $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
-msgstr ""
+msgstr "Mi rifiuto di eseguire lo squash di un merge: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
-msgstr ""
+msgstr "Errore durante la riesecuzione del merge di $sha1"
-#: git-rebase--preserve-merges.sh:403
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:458
+#, sh-format
msgid "Could not pick $sha1"
-msgstr "Non è stato possibile aprire %s"
+msgstr "Impossibile scegliere $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
-msgstr ""
+msgstr "Questo è il messaggio di commit numero ${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
-msgstr ""
+msgstr "Il messaggio di commit numero ${n} sarà saltato:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Questa è una combinazione di $count commit."
+msgstr[1] "Questa è una combinazione di $count commit."
-#: git-rebase--preserve-merges.sh:437
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:492
+#, sh-format
msgid "Cannot write $fixup_msg"
-msgstr "Impossibile sovrascrivere"
+msgstr "Impossibile scrivere $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
-msgstr ""
+msgstr "Questa è una combinazione di 2 commit."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
+#, sh-format
msgid "Could not apply $sha1... $rest"
-msgstr "non è stato possibile applicare %s... %s"
+msgstr "Impossibile applicare $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"before\n"
"you are able to reword the commit."
msgstr ""
+"Impossibile modificare il commit dopo la scelta di $sha1... $rest\n"
+"Molto probabilmente questo è dovuto a un messaggio di commit vuoto, oppure\n"
+"l'esecuzione dell'hook di pre-commit non è riuscita. In quest'ultimo caso,\n"
+"potrebbe essere necessario risolvere il problema evidenziato per essere in\n"
+"grado di modificare il messaggio di commit."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
+msgstr "Fermato a $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
+msgstr "Impossibile eseguire '$squash_style' senza un commit precedente"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
-msgstr ""
+msgstr "Eseguo $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
-msgstr ""
+msgstr "Esecuzione non riuscita: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
-msgstr ""
+msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
+"Puoi correggere il problema e quindi eseguire\n"
+"\n"
+"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
msgstr ""
+"Esecuzione riuscita: $rest\n"
+"ma sono state mantenute modifiche all'indice e/o all'albero di lavoro\n"
+"Esegui il commit o lo stash delle modifiche, quindi esegui\n"
+"\n"
+"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:719
+#, sh-format
msgid "Unknown command: $command $sha1 $rest"
-msgstr "Sottocomando sconosciuto: %s"
+msgstr "Comando sconosciuto: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
+msgstr "Correggi la situazione usando 'git rebase --edit-todo'."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
-msgstr ""
+msgstr "Rebase e aggiornamento di $head_name eseguiti con successo."
-#: git-rebase--preserve-merges.sh:757
-#, fuzzy
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Non è stato possibile risolvere il commit HEAD\n"
+msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
msgstr ""
+"Hai modifiche in staging nell'albero di lavoro.\n"
+"Se queste modifiche devono essere sottoposte a squash nel commit\n"
+"precedente, esegui:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Se devono essere incluse in un nuovo commit, esegui:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In entrambi i casi, una volta finito, continua con:\n"
+"\n"
+" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
+"Errore durante la ricerca dell'identità dell'autore per la modifica del "
+"commit"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
+"Ci sono modifiche di cui non è stato eseguito il commit nel tuo albero\n"
+"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
+"--continue'."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
-#, fuzzy
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
-msgstr "non è stato possibile leggere il messaggio di commit: %s"
+msgstr "Impossibile eseguire il commit delle modifiche in staging."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
-#, fuzzy
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
-msgstr "Non è stato possibile eliminare %s"
+msgstr "Impossibile eseguire l'editor"
-#: git-rebase--preserve-merges.sh:845
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:900
+#, sh-format
msgid "Could not checkout $switch_to"
-msgstr "Non è stato possibile creare la directory '%s'"
+msgstr "Impossibile eseguire il checkout di $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
-msgstr ""
+msgstr "Nessun'HEAD?"
-#: git-rebase--preserve-merges.sh:853
-#, fuzzy, sh-format
+#: git-rebase--preserve-merges.sh:908
+#, sh-format
msgid "Could not create temporary $state_dir"
-msgstr "Non è stato possibile creare la directory '%s'"
+msgstr "Impossibile creare la directory temporanea $state_dir"
-#: git-rebase--preserve-merges.sh:856
-#, fuzzy
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
-msgstr "Non è stato possibile leggere index"
+msgstr "Impossibile contrassegnare come interattivo"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Rebase di $shortrevisions su $shortonto ($todocount comando)"
+msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
-#, fuzzy
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
-msgstr "Non è stato possibile analizzare il commit %s\n"
+msgstr "Impossibile inizializzare i commit riscritti"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
-msgstr ""
+msgstr "uso: $dashless $USAGE"
#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
+"Impossibile modificare la directory corrente in $cdup, il primo livello "
+"dell'albero di lavoro"
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
+"errore fatale: $program_name non può essere usato senza un albero di lavoro."
#: git-sh-setup.sh:221
-#, fuzzy
msgid "Cannot rebase: You have unstaged changes."
-msgstr "Impossibile eseguire il rebase su branch multipli"
+msgstr ""
+"Impossibile eseguire il rebase: ci sono delle modifiche non in staging."
#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
+"Impossibile riscrivere i branch: ci sono delle modifiche non in staging."
#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
+"Impossibile eseguire un pull seguito da un rebase: ci sono delle modifiche "
+"non in staging."
#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
-msgstr ""
+msgstr "Impossibile eseguire $action: ci sono delle modifiche non in staging."
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
+"Impossibile eseguire un rebase:: l'indice contiene modifiche di cui non è "
+"stato eseguito il commit."
#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
+"Impossibile eseguire un pull seguito da un rebase: l'indice contiene "
+"modifiche di cui non è stato eseguito il commit."
#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
+"Impossibile eseguire $action: l'indice contiene modifiche di cui non è stato "
+"eseguito il commit."
#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
+"Inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit."
#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
-msgstr ""
+msgstr "Devi eseguire questo comando dal primo livello dell'albero di lavoro."
#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
-msgstr ""
+msgstr "Impossibile determinare il percorso assoluto della directory Git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
-msgstr ""
+msgstr "%20s %32s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
-msgstr ""
+msgstr "nell'area di staging"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
-msgstr ""
+msgstr "rimosso dall'area di staging"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
-msgstr ""
+msgstr "binario"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
-msgstr ""
+msgstr "non fare nulla"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
-#, fuzzy
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
-msgstr "Nessuna modifica"
+msgstr "non modificato"
-#: git-add--interactive.perl:609
-#, fuzzy, perl-format
+#: git-add--interactive.perl:623
+#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
-msgstr[0] "aggiunto da loro:"
-msgstr[1] "aggiunto da loro:"
+msgstr[0] "aggiunto %d percorso\n"
+msgstr[1] "aggiunti %d percorsi\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "aggiornato %d percorso\n"
+msgstr[1] "aggiornati %d percorsi\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ripristinato %d percorso\n"
+msgstr[1] "ripristinati %d percorsi\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "eseguito touch su %d percorso\n"
+msgstr[1] "eseguito touch su %d percorsi\n"
-#: git-add--interactive.perl:627
-#, fuzzy
+#: git-add--interactive.perl:641
msgid "Update"
-msgstr "aggiornato"
+msgstr "Aggiorna"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
-msgstr ""
+msgstr "Esegui il revert"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
-msgstr ""
+msgstr "nota: %s ora non è tracciato.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
-msgstr ""
+msgstr "Aggiungi file non tracciati"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
-msgstr ""
+msgstr "Nessun file non tracciato.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per l'aggiunta all'area di staging."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per lo stash."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per la rimozione dall'area di staging."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per l'applicazione."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+"contrassegnato immediatamente per la rimozione."
-#: git-add--interactive.perl:1085
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1109
+#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "copia del file in '%s' non riuscita"
+msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
+"Modalità manuale modifica hunt - vedi la fine del file per una guida "
+"veloce.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"To remove '%s' lines, delete them.\n"
"Lines starting with %s will be removed.\n"
msgstr ""
+"---\n"
+"Per rimuovere '%s' righe, rendile righe ' ' (contesto).\n"
+"Per rimuovere '%s' righe, eliminale.\n"
+"Le righe che iniziano con %s saranno rimosse.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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 ""
+"Se non può essere applicata senza problemi, ti sarà data la possibilità\n"
+"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
+"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n"
-#: git-add--interactive.perl:1114
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1138
+#, perl-format
msgid "failed to open hunk edit file for reading: %s"
-msgstr "impossibile aprire o leggere %s"
+msgstr "apertura del file di modifica hunk in lettura non riuscita: %s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. 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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
+"L'hunk modificato non può essere applicato senza problemi. Modificarlo di "
+"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
+"y - aggiungi quest'hunk all'area di staging\n"
+"n - non aggiungere quest'hunk all'area di staging\n"
+"q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di "
+"staging\n"
+"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+"staging\n"
+"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
+"staging"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
+"y - esegui lo stash di quest'hunk\n"
+"n - non eseguire lo stash di quest'hunk\n"
+"q - esci; non eseguire lo stash di quest'hunk né di quelli rimanenti\n"
+"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
+"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
+"y - rimuovi quest'hunk dall'area di staging\n"
+"n - non rimuovere quest'hunk dall'area di staging\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti dall'area di "
+"staging\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di "
+"staging\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
+"staging"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
+"y - applica quest'hunk all'indice\n"
+"n - non applicare quest'hunk all'indice\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
+"y - rimuovi quest'hunk dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
+"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
+"y - applica quest'hunk all'indice e all'albero di lavoro\n"
+"n - non applicare quest'hunk all'indice e all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applica quest'hunk all'albero di lavoro\n"
+"n - non applicare quest'hunk all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-
-#: git-add--interactive.perl:1304
+"g - seleziona un hunk a cui andare\n"
+"/ - cerca un hunk corrispondente all'espressione regolare data\n"
+"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non "
+"è stata presa una decisione\n"
+"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n"
+"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non "
+"è stata presa una decisione\n"
+"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n"
+"s - suddividi l'hunk corrente in hunk più piccoli\n"
+"e - modifica manualmente l'hunk corrente\n"
+"? - stampa una guida\n"
+
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
-msgstr ""
+msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
-msgstr ""
+msgstr "Vuoi comunque applicarli all'albero di lavoro? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
-msgstr ""
+msgstr "Non è stato applicato nulla.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
-msgstr ""
+msgstr "ignoro ciò che non è stato sottoposto a merge: %s\n"
-#: git-add--interactive.perl:1328
-#, fuzzy
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
-msgstr " 0 file modificati\n"
+msgstr "Sono stati modificati solo file binari.\n"
-#: git-add--interactive.perl:1330
-#, fuzzy
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
-msgstr "Nessuna modifica"
+msgstr "Nessuna modifica.\n"
-#: git-add--interactive.perl:1338
-#, fuzzy
+#: git-add--interactive.perl:1374
msgid "Patch update"
-msgstr "[tag aggiornata]"
+msgstr "Aggiornamento patch"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
+msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
+"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
-msgstr ""
+msgstr "Nessun altro hunk a cui andare\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
-msgstr ""
+msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
-msgstr ""
+msgstr "a quale hunk desideri andare? "
-#: git-add--interactive.perl:1540
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1586
+#, perl-format
msgid "Invalid number: '%s'\n"
-msgstr "%s non valido: '%s'"
+msgstr "Numero non valido: '%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mi dispiace, è disponibile solo %d hunk.\n"
+msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
-msgstr ""
+msgstr "Nessun altro hunk in cui ricercare\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
-msgstr ""
+msgstr "cercare un'espressione regolare? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
-msgstr ""
+msgstr "Espressione regolare di ricerca %s malformata: %s\n"
-#: git-add--interactive.perl:1598
-#, fuzzy
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
-msgstr "applica le modifiche corrispondenti al path specificato"
+msgstr "Nessun hunk corrisponde al pattern fornito\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
-msgstr ""
+msgstr "Nessun hunk precedente\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
-msgstr ""
+msgstr "Nessun hunk successivo\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
-msgstr ""
+msgstr "Mi dispiace, non posso suddividere quest'hunk\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Suddiviso in %d hunk.\n"
+msgstr[1] "Suddiviso in %d hunk.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
-msgstr ""
+msgstr "Mi dispiace, non posso modificare quest'hunk\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
-msgstr ""
+msgstr "Rivedi diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state 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:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+"status - visualizza i percorsi con modifiche\n"
+"update - aggiunge lo stato dell'albero di lavoro all'insieme delle\n"
+" modifiche nell'area di staging\n"
+"revert - ripristina l'insieme delle modifiche nell'area di staging\n"
+" alla versione HEAD\n"
+"patch - seleziona e aggiorna gli hunk in modo selettivo\n"
+"diff - visualizza le differenze fra HEAD e l'indice\n"
+"add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n"
+" modifiche nell'area di staging\n"
+
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
-msgstr ""
+msgstr "-- mancante"
-#: git-add--interactive.perl:1763
-#, fuzzy, perl-format
+#: git-add--interactive.perl:1819
+#, perl-format
msgid "unknown --patch mode: %s"
-msgstr "sconosciuto: %s"
+msgstr "modalità --patch sconosciuta: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
-msgstr ""
+msgstr "argomento %s non valido, atteso --"
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
+"il fuso orario locale differisce da GMT di un intervallo non multiplo di un "
+"minuto\n"
#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
+msgstr "l'offset del fuso orario locale è maggiore o uguale a 24 ore\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
+msgstr "l'editor non è terminato regolarmente, interrompo tutte le operazioni"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
+"'%s' contiene una versione intermedia dell'e-mail che stavi componendo.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
-msgstr ""
+msgstr "'%s.final' contiene l'e-mail composta.\n"
-#: git-send-email.perl:326
-#, fuzzy
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
-msgstr "--patch non è compatibile con tutte le altre opzioni"
+msgstr "--dump-aliases non è compatibile con altre opzioni\n"
-#: git-send-email.perl:395 git-send-email.perl:656
-#, fuzzy
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
-msgstr "--cached al di fuori di un repository"
+msgstr "Impossibile eseguire git format-patch al di fuori di un repository\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
+"`batch-size` e `relogin` devono essere specificati insieme (sulla riga di "
+"comando o tramite un'opzione di configurazione)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
+msgstr "Campo --suppress-cc sconosciuto: '%s'\n"
-#: git-send-email.perl:501
-#, fuzzy, perl-format
+#: git-send-email.perl:528
+#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
-msgstr "Commit %s sconosciuto"
+msgstr "Impostazione --confirm sconosciuta: '%s'\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
+msgstr "attenzione: non sono supportati alias sendmail con virgolette: %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
+msgstr "attenzione: `:include:` non supportato: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
+msgstr "attenzione: redirezioni `/file` o `|pipe` non supportate: %s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
+msgstr "attenzione: riga sendmail non riconosciuta: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
+"Il file '%s' esiste ma tale stringa potrebbe corrispondere\n"
+"anche all'intervallo di commit per cui generare delle patch.\n"
+"Specifica qual è il caso corretto...\n"
+"\n"
+" * ...usando \"./%s\" se intendi riferirti al file, o...\n"
+" * ...fornendo l'opzione --format-patch se ti riferisci\n"
+" a un intervallo.\n"
-#: git-send-email.perl:643
-#, fuzzy, perl-format
+#: git-send-email.perl:670
+#, perl-format
msgid "Failed to opendir %s: %s"
-msgstr "apertura di '%s' non riuscita"
+msgstr "opendir di %s non riuscita: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
+"errore fatale: %s: %s\n"
+"attenzione: non è stata inviata alcuna patch\n"
-#: git-send-email.perl:678
-#, fuzzy
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
-msgstr "Nome del branch non specificato"
+msgstr ""
+"\n"
+"Nessun file patch specificato!\n"
+"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
-msgstr ""
+msgstr "Riga oggetto assente in %s?"
-#: git-send-email.perl:701
-#, fuzzy, perl-format
+#: git-send-email.perl:728
+#, perl-format
msgid "Failed to open for writing %s: %s"
-msgstr "Non è stato possibile aprire '%s' per la scrittura"
+msgstr "Apertura di %s in scrittura non riuscita: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
+"Le righe che iniziano con \"GIT:\" saranno rimosse.\n"
+"Valuta di includere un diffstat globale o un sommario per\n"
+"la patch che stai scrivendo.\n"
+"\n"
+"Rimuovi il corpo se non vuoi inviare un sommario.\n"
-#: git-send-email.perl:736
-#, fuzzy, perl-format
+#: git-send-email.perl:763
+#, perl-format
msgid "Failed to open %s: %s"
-msgstr "apertura di '%s' non riuscita"
+msgstr "Apertura di %s non riuscita: %s"
-#: git-send-email.perl:753
-#, fuzzy, perl-format
+#: git-send-email.perl:780
+#, perl-format
msgid "Failed to open %s.final: %s"
-msgstr "apertura di '%s' non riuscita"
+msgstr "Apertura di %s.final non riuscita: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
-msgstr ""
+msgstr "E-mail riassuntiva vuota, la ometto\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
+msgstr "Usare <%s> [y/N]? "
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
+"I seguenti file sono codificati a 8 bit ma non dichiarano un Content-"
+"Transfer-Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
+msgstr "Che codifica a 8 bit devo dichiarare [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
+"Mi rifiuto di eseguire l'invio perché la patch\n"
+"\t%s\n"
+"ha come oggetto nel modello '*** SUBJECT HERE ***'. Fornisci l'opzione --"
+"force se vuoi veramente procedere con l'invio.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
+"A chi dovranno essere inviate le e-mail (se devono essere inviate a "
+"qualcuno)?"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
+msgstr "errore fatale: l'alias '%s' si espande in se stesso\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
+"Message-ID da usare nell'intestazione In-Reply-To per la prima e-mail (se "
+"dev'essere usato)? "
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
+msgstr "errore: impossibile estrarre un indirizzo valido da %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:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
+"Cosa devo fare con quest'indirizzo? (Esci [q]|scarta [d]|modifica [e]): "
-#: git-send-email.perl:1335
-#, fuzzy, perl-format
+#: git-send-email.perl:1362
+#, perl-format
msgid "CA path \"%s\" does not exist"
-msgstr "il repository '%s' non esiste"
+msgstr "Il percorso CA \"%s\" non esiste"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
+" L'elenco Cc di cui sopra è stato espanso aggiungendo\n"
+" indirizzi aggiuntivi trovati nel messaggio di commit della\n"
+" patch. Per impostazione predefinita send-email richiede\n"
+" come procedere prima dell'invio ogniqualvolta si verifichi\n"
+" tale evenienza. Questo comportamento è controllato\n"
+" dall'impostazione di configurazione sendemail.confirm.\n"
+"\n"
+" Per ulteriori informazioni, esegui 'git send-email --help'.\n"
+" Per mantenere il comportamento corrente, ma non\n"
+" visualizzare più questo messaggio, esegui 'git config\n"
+" --global sendemail.confirm auto'.\n"
+"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
+"Inviare quest'e-mail? (Sì [y]|[n]o|modifica [e]|esci [q]|invia tutte [a]): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
-msgstr ""
+msgstr "È richiesta una risposta alla richiesta di invio e-mail"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
-msgstr ""
+msgstr "Il server SMTP richiesto non è definito in modo adeguato."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
-msgstr ""
+msgstr "Il server non supporta STARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
-msgstr ""
+msgstr "STARTTLS non riuscito! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
+"Impossibile inizializzare SMTP in modo adeguato. Controlla la configurazione "
+"e usa --smtp-debug."
-#: git-send-email.perl:1547
-#, fuzzy, perl-format
+#: git-send-email.perl:1574
+#, perl-format
msgid "Failed to send %s\n"
-msgstr "stat di %s non riuscito\n"
+msgstr "Invio di %s non riuscito\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
-msgstr ""
+msgstr "Test invio %s riuscito\n"
-#: git-send-email.perl:1550
-#, fuzzy, perl-format
+#: git-send-email.perl:1577
+#, perl-format
msgid "Sent %s\n"
-msgstr "Rimozione di %s\n"
+msgstr "%s inviato\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
-msgstr ""
+msgstr "Esecuzione di prova riuscita. Il registro è il seguente:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
-msgstr ""
+msgstr "Operazione riuscita. Il registro è il seguente:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
-msgstr ""
+msgstr "Risultato: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
-msgstr ""
+msgstr "Risultato: OK\n"
-#: git-send-email.perl:1585
-#, fuzzy, perl-format
+#: git-send-email.perl:1612
+#, perl-format
msgid "can't open file %s"
-msgstr "impossibile aprire il file pack '%s'"
+msgstr "impossibile aprire il file %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Aggiungo cc: %s dalla riga '%s'\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Aggiungo to: %s dalla riga '%s'\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(non mbox) Aggiungo cc: %s dalla riga '%s'\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(corpo) Aggiungo cc: %s dalla riga '%s'\n"
-#: git-send-email.perl:1837
-#, fuzzy, perl-format
+#: git-send-email.perl:1864
+#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr "Non è stato possibile impostare '%s'"
+msgstr "(%s) Impossibile eseguire '%s'"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
+msgstr "(%s) Aggiungo %s: %s da: '%s'\n"
-#: git-send-email.perl:1848
-#, fuzzy, perl-format
+#: git-send-email.perl:1875
+#, perl-format
msgid "(%s) failed to close pipe to '%s'"
-msgstr "copia del file in '%s' non riuscita"
+msgstr "(%s) chiusura della pipe a '%s' non riuscita"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
-msgstr ""
+msgstr "impossibile inviare il messaggio con codifica a 7 bit"
-#: git-send-email.perl:1886
-#, fuzzy
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
-msgstr "riferimento non valido: %s"
+msgstr "codifica di trasferimento non valida"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
-#, fuzzy, perl-format
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#, perl-format
msgid "unable to open %s: %s\n"
-msgstr "impossibile spostare %s in %s"
+msgstr "impossibile aprire %s: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
-msgstr ""
+msgstr "%s: la patch contiene una riga più lunga di 998 caratteri"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
+msgstr "Salto %s con il suffisso di backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr "Inviare %s? [y|N]:"
+msgstr "Inviare %s? [y|N]: "
+
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "Il fetch normalmente indica quali branch siano stati sottoposti ad "
+#~ "aggiornamento forzato, ma tale controllo è stato disabilitato."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "o eseguire 'git config fetch.showForcedUpdates false' per omettere "
+#~ "questo\n"
+#~ "controllo.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "log.mailmap non è impostato; il suo valore implicito sarà modificato\n"
+#~ "in una prossima versione. Per eliminare questo messaggio e mantenere\n"
+#~ "il comportamento attuale, imposta il valore di configurazione\n"
+#~ "log.mailmap a false.\n"
+#~ "\n"
+#~ "Per eliminare questo messaggio e adottare il nuovo comportamento ora,\n"
+#~ "imposta il valore di configurazione log.mailmap a true.\n"
+#~ "\n"
+#~ "Vedi 'git help config' e cerca 'log.mailmap' per ulteriori informazioni."
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Il server supporta multi_ack_detailes"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Il server supporta no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Il server supporta multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Il server supporta side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Il server supporta side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Il server supporta allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Il server supporta allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Il server supporta ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD scollegato su %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD scollegato da %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checkout dei file in corso"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "impossibile eseguire l'attività in modalità interattiva con lo standard "
+#~ "input non collegato a un terminale."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "apertura di '%s' non riuscita"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "stat di %s non riuscito\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Se vuoi ignorare questo commit, usa:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Quindi il comando \"git cherry-pick --continue\" farà riprendere\n"
+#~ "il cherry picking per i commit rimanenti.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verbo non riconosciuto: %s"
#~ msgid "hash version %X does not match version %X"
#~ msgstr "la versione dell'hash %X non corrisponde alla versione %X"
#~ msgid "No such remote: %s"
#~ msgstr "Remote non esistente: %s"
-#, fuzzy
-#~ msgid "Applied autostash."
-#~ msgstr "Patch %s applicata correttamente."
-
-#, fuzzy
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Impossibile inizializzare stash"
-
#~ msgid " %d file changed"
#~ msgid_plural " %d files changed"
#~ msgstr[0] " %d file modificato"
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2018
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2019
# insolor, 2014
# insolor, 2014
+# Чук Таблицоменделеев <aurum444an@gmail.com>, 2019
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: 2018-08-21 08:28+0800\n"
-"PO-Revision-Date: 2018-08-28 15:57+0000\n"
+"POT-Creation-Date: 2019-06-04 08:24+0800\n"
+"PO-Revision-Date: 2019-06-21 17:28+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"
"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:97
+#: advice.c:103
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:150
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
-#: advice.c:152
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
-#: advice.c:154
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
-#: advice.c:156
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
-#: advice.c:158
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
-#: advice.c:160
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
-#: advice.c:168
+#: advice.c:174
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:176
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr "Выход из-за неразрешенного конфликта."
-#: advice.c:181 builtin/merge.c:1286
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
-#: advice.c:183
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr "Перед слиянием, выполните коммит ваших изменений."
-#: advice.c:184
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr "Выход из-за незавершенного слияния."
-#: advice.c:190
+#: advice.c:196
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n"
-#: apply.c:59
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "командная строка заканчивается символом \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "пропущена закрывающая кавычка"
+
+#: apply.c:63
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "неопознанная опция для пробелов «%s»"
-#: apply.c:75
+#: apply.c:79
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "неопознанная опция для игнорирования пробелов «%s»"
-#: apply.c:125
+#: apply.c:129
msgid "--reject and --3way cannot be used together."
msgstr "--reject и --3way нельзя использовать одновременно."
-#: apply.c:127
+#: apply.c:131
msgid "--cached and --3way cannot be used together."
msgstr "--cached и --3way нельзя использовать одновременно."
-#: apply.c:130
+#: apply.c:134
msgid "--3way outside a repository"
msgstr "--3way вне репозитория"
-#: apply.c:141
+#: apply.c:145
msgid "--index outside a repository"
msgstr "--index вне репозитория"
-#: apply.c:144
+#: apply.c:148
msgid "--cached outside a repository"
msgstr "--cached вне репозитория"
-#: apply.c:826
+#: apply.c:829
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
-#: apply.c:835
+#: apply.c:838
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec возвратил %d для ввода: %s"
-#: apply.c:909
+#: apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "не удалось найти имя файла в строке патча %d"
-#: apply.c:947
+#: apply.c:950
#, 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:953
+#: apply.c:956
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
-#: apply.c:954
+#: apply.c:957
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
-#: apply.c:959
+#: apply.c:962
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
-#: apply.c:988
+#: apply.c:991
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "недопустимый режим %d: %s"
-#: apply.c:1306
+#: apply.c:1310
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "противоречивые строки заголовка %d и %d"
-#: apply.c:1478
+#: apply.c:1482
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: не ожидаемая строка: %.*s"
-#: apply.c:1547
+#: apply.c:1551
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
-#: apply.c:1567
+#: apply.c:1571
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-#: apply.c:1580
+#: apply.c:1584
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
-#: apply.c:1768
+#: apply.c:1772
msgid "new file depends on old contents"
msgstr "новый файл зависит от старого содержимого"
-#: apply.c:1770
+#: apply.c:1774
msgid "deleted file still has contents"
msgstr "удаленный файл все еще имеет содержимое"
-#: apply.c:1804
+#: apply.c:1808
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на строке %d"
-#: apply.c:1841
+#: apply.c:1845
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s зависит от старого содержимого"
-#: apply.c:1843
+#: apply.c:1847
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s все еще имеет содержимое"
-#: apply.c:1846
+#: apply.c:1850
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
-#: apply.c:1993
+#: apply.c:1997
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на строке %d: %.*s"
-#: apply.c:2030
+#: apply.c:2034
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на строке %d"
-#: apply.c:2190
+#: apply.c:2196
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч с мусором на строке %d"
-#: apply.c:2276
+#: apply.c:2282
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: apply.c:2280
+#: apply.c:2286
#, c-format
msgid "unable to open or read %s"
msgstr "не удалось открыть или прочесть %s"
-#: apply.c:2939
+#: apply.c:2945
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало строки: «%c»"
-#: apply.c:3060
+#: apply.c:3066
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-#: apply.c:3072
+#: apply.c:3078
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
-#: apply.c:3078
+#: apply.c:3084
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиске:\n%.*s"
-#: apply.c:3100
+#: apply.c:3106
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча для «%s»"
-#: apply.c:3108
+#: apply.c:3114
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
-#: apply.c:3154
+#: apply.c:3161
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
-#: apply.c:3164
+#: apply.c:3171
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
-#: apply.c:3172
+#: apply.c:3179
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
-#: apply.c:3190
+#: apply.c:3197
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "не удалось прочитать необходимую посылку %s для «%s»"
-#: apply.c:3203
+#: apply.c:3210
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалось применить двоичный патч к «%s»"
-#: apply.c:3209
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
-#: apply.c:3230
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка применения изменений: %s:%ld"
-#: apply.c:3352
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "не удалось переключить состояние на %s"
-#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "не удалось прочитать %s"
-#: apply.c:3412
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за символической ссылкой"
-#: apply.c:3441 apply.c:3681
+#: apply.c:3449 apply.c:3692
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: apply.c:3524 apply.c:3696
+#: apply.c:3535 apply.c:3707
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индексе"
-#: apply.c:3533 apply.c:3704
+#: apply.c:3544 apply.c:3715
#, c-format
msgid "%s: does not match index"
msgstr "%s: не совпадает с индексом"
-#: apply.c:3568
+#: apply.c:3579
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
-#: apply.c:3571
+#: apply.c:3582
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Откат к трёхходовому слиянию…\n"
-#: apply.c:3587 apply.c:3591
+#: apply.c:3598 apply.c:3602
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "не удалось прочитать текущее содержимое «%s»"
-#: apply.c:3603
+#: apply.c:3614
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
-#: apply.c:3617
+#: apply.c:3628
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Патч применен к «%s» с конфликтами.\n"
-#: apply.c:3622
+#: apply.c:3633
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Патч применен к «%s» без ошибок.\n"
-#: apply.c:3648
+#: apply.c:3659
msgid "removal patch leaves file contents"
msgstr "патч удаления не удалил содержимое файла"
-#: apply.c:3721
+#: apply.c:3732
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: apply.c:3723
+#: apply.c:3734
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидался %o"
-#: apply.c:3874 apply.c:3876
+#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "неправильный путь «%s»"
-#: apply.c:3932
+#: apply.c:3943
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже содержится в индексе"
-#: apply.c:3935
+#: apply.c:3946
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже содержится в рабочем каталоге"
-#: apply.c:3955
+#: apply.c:3966
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
-#: apply.c:3960
+#: apply.c:3971
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
-#: apply.c:3980
+#: apply.c:3991
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находится за символической ссылкой"
-#: apply.c:3984
+#: apply.c:3995
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалось применить патч"
-#: apply.c:3999
+#: apply.c:4010
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: apply.c:4091
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
-#: apply.c:4098
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "изменен режим для %s, который не находится в текущем HEAD"
-#: apply.c:4101
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информация об sha1 отсутствует или бесполезна (%s)."
-#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
+#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "сбой make_cache_entry для пути «%s»"
-#: apply.c:4110
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "не удалось добавить %s во временный индекс"
-#: apply.c:4120
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "не удалось записать временный индкекс в %s"
-#: apply.c:4258
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалось удалить %s из индекса"
-#: apply.c:4292
+#: apply.c:4303
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч для подмодуля %s"
-#: apply.c:4298
+#: apply.c:4309
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалось выполнить stat для созданного файла «%s»"
-#: apply.c:4306
+#: apply.c:4317
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалось создать вспомогательный файл для созданного файла %s"
-#: apply.c:4312 apply.c:4457
+#: apply.c:4323 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалось создать запись в кэше для %s"
-#: apply.c:4355
+#: apply.c:4366
#, c-format
msgid "failed to write to '%s'"
msgstr "не удалось записать в «%s»"
-#: apply.c:4359
+#: apply.c:4370
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: apply.c:4429
+#: apply.c:4440
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалось записать файл «%s» с режимом доступа %o"
-#: apply.c:4527
+#: apply.c:4538
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: apply.c:4535
+#: apply.c:4546
msgid "internal error"
msgstr "внутренняя ошибка"
-#: apply.c:4538
+#: apply.c:4549
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[2] "Применение патча %%s с %d отказами…"
msgstr[3] "Применение патча %%s с %d отказами…"
-#: apply.c:4549
+#: apply.c:4560
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "усечение имени .rej файла до %.*s.rej"
-#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
+#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr "не удалось открыть %s"
-#: apply.c:4571
+#: apply.c:4582
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: apply.c:4575
+#: apply.c:4586
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: apply.c:4685
+#: apply.c:4696
#, c-format
msgid "Skipped patch '%s'."
msgstr "Патч «%s» пропущен."
-#: apply.c:4693
+#: apply.c:4704
msgid "unrecognized input"
msgstr "не распознанный ввод"
-#: apply.c:4712
+#: apply.c:4724
msgid "unable to read index file"
msgstr "не удалось прочитать файл индекса"
-#: apply.c:4849
+#: apply.c:4879
#, c-format
msgid "can't open patch '%s': %s"
msgstr "не удалось открыть патч «%s»: %s"
-#: apply.c:4876
+#: apply.c:4906
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[2] "пропущено %d ошибок в пробельных символах"
msgstr[3] "пропущено %d ошибок в пробельных символах"
-#: apply.c:4882 apply.c:4897
+#: apply.c:4912 apply.c:4927
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[2] "%d строк добавили ошибки в пробельных символах."
msgstr[3] "%d строк добавили ошибки в пробельных символах."
-#: apply.c:4890
+#: apply.c:4920
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
-#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Не удалось записать новый файл индекса"
-#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
-#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
-#: builtin/pull.c:198 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
-#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
-#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197
+#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
+#: builtin/pull.c:207 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
+#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
msgid "path"
msgstr "путь"
-#: apply.c:4934
+#: apply.c:4964
msgid "don't apply changes matching the given path"
msgstr "не применять изменения по указанному пути"
-#: apply.c:4937
+#: apply.c:4967
msgid "apply changes matching the given path"
msgstr "применять изменения по указанному пути"
-#: apply.c:4939 builtin/am.c:2263
+#: apply.c:4969 builtin/am.c:2219
msgid "num"
msgstr "количество"
-#: apply.c:4940
+#: apply.c:4970
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
-#: apply.c:4943
+#: apply.c:4973
msgid "ignore additions made by the patch"
msgstr "игнорировать добавления, сделанные этим патчем"
-#: apply.c:4945
+#: apply.c:4975
msgid "instead of applying the patch, output diffstat for the input"
msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
-#: apply.c:4949
+#: apply.c:4979
msgid "show number of added and deleted lines in decimal notation"
msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
-#: apply.c:4951
+#: apply.c:4981
msgid "instead of applying the patch, output a summary for the input"
-msgstr "вместо применения патча вывести статистику изменений для ввода"
+msgstr "вместо применения патча вывести сводку изменений для ввода"
-#: apply.c:4953
+#: apply.c:4983
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "вместо применения патча проверить подходит ли он"
-#: apply.c:4955
+#: apply.c:4985
msgid "make sure the patch is applicable to the current index"
msgstr "проверить, что патч применяется к текущему индексу"
-#: apply.c:4957
+#: apply.c:4987
msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "помечать новые файлы с «git add --intent-to-add»"
-#: apply.c:4959
+#: apply.c:4989
msgid "apply a patch without touching the working tree"
msgstr "применить патч, не изменяя рабочий каталог"
-#: apply.c:4961
+#: apply.c:4991
msgid "accept a patch that touches outside the working area"
msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
-#: apply.c:4964
+#: apply.c:4994
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "а также применить патч (используйте с --stat/--summary/--check)"
-#: apply.c:4966
+#: apply.c:4996
msgid "attempt three-way merge if a patch does not apply"
msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
-#: apply.c:4968
+#: apply.c:4998
msgid "build a temporary index based on embedded index information"
msgstr "построить временный индекс, основанный на встроенной информации об индексе"
-#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
+#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "пути, отделённые НУЛЕВЫМ символом"
-#: apply.c:4973
+#: apply.c:5003
msgid "ensure at least <n> lines of context match"
msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
-#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
-#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3205
+#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
msgid "action"
msgstr "действие"
-#: apply.c:4975
+#: apply.c:5005
msgid "detect new or modified lines that have whitespace errors"
msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
-#: apply.c:4978 apply.c:4981
+#: apply.c:5008 apply.c:5011
msgid "ignore changes in whitespace when finding context"
msgstr "игнорировать изменения в пробельных символах при поиске контекста"
-#: apply.c:4984
+#: apply.c:5014
msgid "apply the patch in reverse"
msgstr "применить патч с обращением изменений"
-#: apply.c:4986
+#: apply.c:5016
msgid "don't expect at least one line of context"
msgstr "не ожидать как минимум одной строки контекста"
-#: apply.c:4988
+#: apply.c:5018
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
-#: apply.c:4990
+#: apply.c:5020
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеся блоки изменений"
-#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
-#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124
+#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "быть многословнее"
-#: apply.c:4993
+#: apply.c:5023
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
-#: apply.c:4996
+#: apply.c:5026
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверять количеству строк из заголовка блока изменений"
-#: apply.c:4998 builtin/am.c:2251
+#: apply.c:5028 builtin/am.c:2207
msgid "root"
msgstr "корень"
-#: apply.c:4999
+#: apply.c:5029
msgid "prepend <root> to all filenames"
msgstr "добавить <корень> спереди ко всем именам файлов"
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
-#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
-#: archive.c:446
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "нет такой ссылки: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "недопустимое имя объекта: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "недействительный объект дерева: %s"
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr "текущий рабочий каталог не отслеживается"
+
+#: archive.c:455
msgid "fmt"
msgstr "формат"
-#: archive.c:446
+#: archive.c:455
msgid "archive format"
msgstr "формат архива"
-#: archive.c:447 builtin/log.c:1473
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr "префикс"
-#: archive.c:448
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr "добавлять префикс перед каждым путем файла в архиве"
-#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
-#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
-#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119
-#: parse-options.h:165
+#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
+#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "файл"
-#: archive.c:450 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "запись архива в этот файл"
-#: archive.c:452
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr "читать .gitattributes в рабочем каталоге"
-#: archive.c:453
+#: archive.c:462
msgid "report archived files on stderr"
msgstr "отчет об архивированных файлах в stderr"
-#: archive.c:454
+#: archive.c:463
msgid "store only"
msgstr "только хранение"
-#: archive.c:455
+#: archive.c:464
msgid "compress faster"
msgstr "сжимать быстрее"
-#: archive.c:463
+#: archive.c:472
msgid "compress better"
msgstr "сжимать лучше"
-#: archive.c:466
+#: archive.c:475
msgid "list supported archive formats"
msgstr "перечислить поддерживаемые форматы архивов"
-#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr "репозиторий"
-#: archive.c:469 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "получить архив из внешнего <репозитория>"
-#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:491
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr "команда"
-#: archive.c:471 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
-#: archive.c:478
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr "Неожиданная опция --remote"
-#: archive.c:480
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr "Опция --exec может использоваться только вместе с --remote"
-#: archive.c:482
+#: archive.c:491
msgid "Unexpected option --output"
msgstr "Неожиданная опция --output"
-#: archive.c:504
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Неизвестный формат архива «%s»"
-#: archive.c:511
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргумент не поддерживается для формата «%s»: -%d"
-#: archive-tar.c:125 archive-zip.c:344
+#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr "не удалось создать поток двоичного объекта %s"
-#: archive-tar.c:260 archive-zip.c:361
+#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)"
-#: archive-tar.c:287 archive-zip.c:352
+#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr "не удалось прочитать %s"
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "не удалось запустить фильтр «%s»"
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "не удалось перенаправить дескриптор"
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "фильтр «%s» сообщил об ошибке"
-#: archive-zip.c:313
+#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "путь не является действительным UTF-8: %s"
-#: archive-zip.c:317
+#: archive-zip.c:318
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "путь слишком длинный (%d символов, SHA1: %s): %s"
-#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
#, c-format
msgid "deflate error (%d)"
msgstr "ошибка сжатия (%d)"
-#: archive-zip.c:605
+#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>"
-#: attr.c:218
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s не является допустимым именем атрибута"
-#: attr.c:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s не разрешено: %s:%d"
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
-#: bisect.c:467
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Плохое содержимое файла «%s»: %s"
-#: bisect.c:675
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Невозможно продолжить бинарный поиск!\n"
-#: bisect.c:729
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "Недопустимое имя коммита %s"
-#: bisect.c:753
+#: bisect.c:758
#, 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:758
+#: bisect.c:763
#, 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:763
+#: bisect.c:768
#, 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:771
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
-#: bisect.c:784
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
-#: bisect.c:817
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Бинарный поиск: база слияния должна быть проверена\n"
-#: bisect.c:857
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "нужно указать %s редакцию"
-#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr "не удалось создать файл «%s»"
-#: bisect.c:927 builtin/merge.c:137
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr "не удалось прочитать файл «%s»"
-#: bisect.c:957
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "сбой при чтении ссылок двоичного поиска"
-#: bisect.c:976
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s была одновременно и %s и %s\n"
-#: bisect.c:984
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
-#: bisect.c:1003
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#: bisect.c:1009
+#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
-#: blame.c:1786
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr "--contents и --reverse не очень сочетаются."
-#: blame.c:1800
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr "нельзя использовать --contents с указанием финального имени объекта"
-#: blame.c:1821
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
-#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
-#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
-#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963
-#: builtin/merge.c:404 builtin/pack-objects.c:3032 builtin/pack-objects.c:3047
+#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
+#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
+#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094
+#: builtin/merge.c:415 builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "сбой инициализации прохода по редакциям"
-#: blame.c:1848
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
-#: blame.c:1859
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr "нет такого пути %s в %s"
-#: blame.c:1870
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "невозможно прочитать объект %s для пути %s"
-#: branch.c:54
+#: branch.c:53
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr "\nПосле исправления причины ошибки,\nвы можете исправить информацию об отслеживаемой\nвнешней ветке, с помощью команды\n«git branch --set-upstream-to=%s%s%s»."
-#: branch.c:68
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию."
-#: branch.c:94
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением."
-#: branch.c:95
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»."
-#: branch.c:99
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "Ветка «%s» отслеживает локальную ветку «%s» перемещением."
-#: branch.c:100
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "Ветка «%s» отслеживает локальную ветку «%s»."
-#: branch.c:105
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением."
-#: branch.c:106
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»."
-#: branch.c:110
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "Ветка «%s» отслеживает локальную ссылку «%s» перемещением."
-#: branch.c:111
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Ветка «%s» отслеживает локальную ссылку «%s»."
-#: branch.c:120
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "Не удалось записать настройки вышестоящей ветки"
-#: branch.c:157
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Не отслеживается: неоднозначная информация для ссылки %s"
-#: branch.c:190
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» не является действительным именем ветки."
-#: branch.c:209
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Ветка с именем «%s» уже существует."
-#: branch.c:214
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Не удалось принудительно обновить текущую ветку."
-#: branch.c:234
+#: branch.c:233
#, c-format
msgid ""
"Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
-#: branch.c:236
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
-#: branch.c:238
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
msgid "Not a valid branch point: '%s'."
msgstr "Недопустимая точка ветки: «%s»."
-#: branch.c:360
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находится на «%s»"
-#: branch.c:383
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD рабочего каталога %s не обновлён"
msgid "unrecognized header: %s%s (%d)"
msgstr "неопознанный заголовок: %s%s (%d)"
-#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
+#: builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr "не удалось открыть «%s»"
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "В репозитории отсутствуют необходимые коммиты:"
-#: bundle.c:192
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[2] "Пакет содержит эти %d ссылок:"
msgstr[3] "Пакет содержит эти %d ссылок:"
-#: bundle.c:199
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr "Пакет содержит полную историю."
-#: bundle.c:201
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[2] "Пакет требует эти %d ссылок:"
msgstr[3] "Пакет требует эти %d ссылок:"
-#: bundle.c:260
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr "не удалось дублировать дескриптор пакета"
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr "Не удалось создать объекты пакета"
-#: bundle.c:271
+#: bundle.c:287
msgid "pack-objects died"
msgstr "критическая ошибка pack-objects"
-#: bundle.c:313
+#: bundle.c:329
msgid "rev-list died"
msgstr "критическая ошибка rev-list"
-#: bundle.c:362
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
+#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
-#: bundle.c:461
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr "Отклонение создания пустого пакета."
-#: bundle.c:473
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr "не удалось создать «%s»"
-#: bundle.c:501
+#: bundle.c:500
msgid "index-pack died"
msgstr "критическая ошибка index-pack"
msgid "invalid color value: %.*s"
msgstr "недопустимое значение цвета: %.*s"
-#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
-#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376
-#: builtin/replace.c:448
+#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "не удалось разобрать %s"
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не является коммитом!"
-#: commit.c:191
+#: commit.c:193
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»"
-#: commit.c:1629
+#: commit.c:1128
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
+
+#: commit.c:1134
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Коммит %s не содержит GPG подпись."
+
+#: commit.c:1137
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
+
+#: commit.c:1391
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n"
-#: commit-graph.c:83
-#, c-format
-msgid "graph file %s is too small"
-msgstr ""
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
+msgstr "файл commit-graph слишком маленький"
-#: commit-graph.c:90
+#: commit-graph.c:170
#, c-format
-msgid "graph signature %X does not match signature %X"
-msgstr ""
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
-#: commit-graph.c:97
+#: commit-graph.c:177
#, c-format
-msgid "graph version %X does not match version %X"
-msgstr ""
+msgid "commit-graph version %X does not match version %X"
+msgstr "версия commit-graph файла %X не соотвествует версии %X"
-#: commit-graph.c:104
+#: commit-graph.c:184
#, c-format
-msgid "hash version %X does not match version %X"
-msgstr ""
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версия хеш-суммы commit-graph файла %X не соответствует версии %X"
+
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
+msgstr "не найдена таблица расположения частей в файле commit-graph; возможно файл повреждён"
-#: commit-graph.c:128
+#: commit-graph.c:218
#, c-format
-msgid "improper chunk offset %08x%08x"
-msgstr ""
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "некорректное смещение части в commit-graph файле %08x%08x"
-#: commit-graph.c:164
+#: commit-graph.c:255
#, c-format
-msgid "chunk id %08x appears multiple times"
-msgstr ""
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "часть файла commit-graph с идентификатором %08x появляется несколько раз"
-#: commit-graph.c:261
+#: commit-graph.c:390
#, c-format
msgid "could not find commit %s"
-msgstr ""
+msgstr "не удалось найти коммит %s"
-#: commit-graph.c:565 builtin/pack-objects.c:2571
+#: commit-graph.c:732 builtin/pack-objects.c:2649
#, c-format
msgid "unable to get type of object %s"
-msgstr ""
+msgstr "не удалось получить тип объекта %s"
-#: commit-graph.c:730
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
+msgstr "Загрузка известных коммитов на граф коммитов"
+
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
+msgstr "Расширение достижимых коммитов на граф коммитов"
+
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
+msgstr "Очистка пометок коммитов на графе коммитов"
+
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
+msgstr "Вычисление номеров поколений на графе коммитов"
+
+#: commit-graph.c:930
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Поиск коммитов для графа коммитов в %d пакете"
+msgstr[1] "Поиск коммитов для графа коммитов в %d пакетах"
+msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах"
+msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах"
+
+#: commit-graph.c:943
#, c-format
msgid "error adding pack %s"
-msgstr ""
+msgstr "ошибка добавления пакета %s"
-#: commit-graph.c:732
+#: commit-graph.c:945
#, c-format
msgid "error opening index for %s"
-msgstr ""
+msgstr "ошибка открытия индекса для %s"
-#: commit-graph.c:773
+#: commit-graph.c:959
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Поиск коммитов для графа коммитов по %d ссылке"
+msgstr[1] "Поиск коммитов для графа коммитов по %d ссылкам"
+msgstr[2] "Поиск коммитов для графа коммитов по %d ссылкам"
+msgstr[3] "Поиск коммитов для графа коммитов по %d ссылкам"
+
+#: commit-graph.c:991
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
+
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
+msgstr "Вычисление количества отдельных коммитов на графе коммитов"
+
+#: commit-graph.c:1017
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "программе форматирования графа коммитов не удалось записать %d коммитов"
-#: commit-graph.c:800
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
+msgstr "Поиск дополнительных ребер на графе коммитов"
+
+#: commit-graph.c:1050
msgid "too many commits to write graph"
msgstr "слишком много коммитов для записи графа"
-#: commit-graph.c:806
+#: commit-graph.c:1057 midx.c:819
#, c-format
msgid "unable to create leading directories of %s"
msgstr "не удалось создать родительские каталоги для %s"
-#: commit-graph.c:904
+#: commit-graph.c:1097
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Запись графа коммитов в %d проход"
+msgstr[1] "Запись графа коммитов в %d прохода"
+msgstr[2] "Запись графа коммитов в %d проходов"
+msgstr[3] "Запись графа коммитов в %d прохода"
+
+#: commit-graph.c:1162
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
+msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден"
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1172
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
+
+#: commit-graph.c:1182 commit-graph.c:1197
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u"
+
+#: commit-graph.c:1189
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "не удалось разобрать коммит %s из файла commit-graph"
+
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
+msgstr "Проверка коммитов на графе коммитов"
+
+#: commit-graph.c:1219
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
+
+#: commit-graph.c:1226
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr " в файле commit-graph OID корня дерева для коммита %s является %s != %s"
+
+#: commit-graph.c:1236
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "слишком большой список родителей файле commit-graph для коммита %s"
+
+#: commit-graph.c:1242
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "в файле commit-graph родитель для %s является %s != %s"
+
+#: commit-graph.c:1255
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано"
+
+#: commit-graph.c:1260
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях"
+
+#: commit-graph.c:1264
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях"
+
+#: commit-graph.c:1279
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u"
+
+#: commit-graph.c:1285
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "память исчерпана"
"\t%s\n"
"from\n"
"\t%s\n"
-"Do you have circular includes?"
+"This might be due to circular includes."
msgstr ""
#: config.c:139
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2206
+#: config.c:378 sequencer.c:2459
#, c-format
msgid "invalid key: %s"
msgstr "недействительный ключ: %s"
msgid "invalid mode for object creation: %s"
msgstr "недопустимый режим создания объекта: %s"
-#: config.c:1403
+#: config.c:1395
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1429
+#: config.c:1421
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1422
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1489 builtin/pack-objects.c:3282
+#: config.c:1483 builtin/pack-objects.c:3397
#, c-format
msgid "bad pack compression level %d"
msgstr "неправильный уровень сжатия пакета %d"
-#: config.c:1610
+#: config.c:1604
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1613
+#: config.c:1607
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1630
+#: config.c:1624
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1660
+#: config.c:1654
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1700
+#: config.c:1710
msgid "unable to parse command-line config"
msgstr "не удалось разобрать конфигурацию из командной строки"
-#: config.c:2032
+#: config.c:2059
msgid "unknown error occurred while reading the configuration files"
msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
-#: config.c:2202
+#: config.c:2229
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Недействительный %s: «%s»"
-#: config.c:2245
+#: config.c:2272
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»"
-#: config.c:2271
+#: config.c:2298
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
-#: config.c:2296
+#: config.c:2344
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-#: config.c:2298
+#: config.c:2346
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
-#: config.c:2379
+#: config.c:2427
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2411
+#: config.c:2459
#, c-format
msgid "%s has multiple values"
msgstr "%s имеет несколько значений"
-#: config.c:2440
+#: config.c:2488
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2691 config.c:3015
+#: config.c:2740 config.c:3064
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2702
+#: config.c:2751
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2737 builtin/config.c:324
+#: config.c:2786 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2762
+#: config.c:2811
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2775 config.c:3028
+#: config.c:2824 config.c:3077
#, c-format
msgid "fstat on %s failed"
msgstr "сбой при выполнении fstat на файле %s"
-#: config.c:2786
+#: config.c:2835
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2795 config.c:3033
+#: config.c:2844 config.c:3082
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2880 config.c:3130
+#: config.c:2929 config.c:3179
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2914
+#: config.c:2963
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "не удалось установить «%s» в «%s»"
-#: config.c:2916 builtin/remote.c:781
+#: config.c:2965 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "не удалось сбросить значение для «%s»"
-#: config.c:3006
+#: config.c:3055
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3173
+#: config.c:3222
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "ошибка внешнего репозитория: %s"
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr ""
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Проверка соединения"
-#: connected.c:80
+#: connected.c:97
msgid "Could not run 'git rev-list'"
msgstr "Не удалось запустить «git rev-list»"
-#: connected.c:100
+#: connected.c:117
msgid "failed write to rev-list"
msgstr "сбой записи в rev-list"
-#: connected.c:107
+#: connected.c:124
msgid "failed to close rev-list's stdin"
msgstr "сбой закрытия стандартного ввода у rev-list"
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:208
#, 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 ""
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF будет заменен на CRLF в %s"
-#: convert.c:219
+#: convert.c:218
#, 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 ""
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "BOM запрещен в «%s», если кодируется как %s"
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "
"working-tree-encoding."
msgstr "Файл «%s» содержит маркер последовательности байтов (BOM). Используйте UTF-%s как кодировку рабочего каталога."
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "BOM требуется в «%s», если кодируется как %s"
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or "
"UTF-%sLE (depending on the byte order) as working-tree-encoding."
msgstr "Файл «%s» не содержит маркер последовательности байтов (BOM). Используйте UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку рабочего каталога."
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "не удалось перекодировать «%s» из %s в %s"
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же"
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr ""
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false не является допустимым значением для working-tree-encoding"
-#: convert.c:1402 convert.c:1436
+#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1480
+#: convert.c:1476
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr "в будущем"
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[2] "%<PRIuMAX> секунд назад"
msgstr[3] "%<PRIuMAX> секунды назад"
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[2] "%<PRIuMAX> минут назад"
msgstr[3] "%<PRIuMAX> минуты назад"
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[2] "%<PRIuMAX> часов назад"
msgstr[3] "%<PRIuMAX> часа назад"
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[2] "%<PRIuMAX> дней назад"
msgstr[3] "%<PRIuMAX> дня назад"
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[2] "%<PRIuMAX> недель назад"
msgstr[3] "%<PRIuMAX> недели назад"
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[2] "%<PRIuMAX> месяцев назад"
msgstr[3] "%<PRIuMAX> месяца назад"
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[3] "%<PRIuMAX> года"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[2] "%s, %<PRIuMAX> месяцев назад"
msgstr[3] "%s, %<PRIuMAX> месяца назад"
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[2] "%<PRIuMAX> лет назад"
msgstr[3] "%<PRIuMAX> года назад"
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:466
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "сбой чтения orderfile «%s»"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr "Выполняется неточное определение переименования"
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
-msgstr "параметр «%s» требует указания значения"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
-#: diff.c:158
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "Неизвестный параметр dirstat: «%s»\n"
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change',"
+" 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:323
+#: diff.c:332
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white"
-" space modes"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»"
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:4096
+#: diff.c:4210
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-#: diff.c:4427
+#: diff.c:4555
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-#: diff.c:4430
+#: diff.c:4558
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S и --find-object нельзя использовать одновременно"
-#: diff.c:4508
+#: diff.c:4636
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одного спецификатора пути"
-#: diff.c:4674
+#: diff.c:4684
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
-msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
+msgid "invalid --stat value: %s"
+msgstr ""
-#: diff.c:4688
+#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: parse-options.c:199 parse-options.c:203
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "Сбой разбора параметра опции --submodule: «%s»"
-
-#: diff.c:5766
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-
-#: diff.c:5769
-msgid "only found copies from modified paths due to too many files."
-msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
+msgid "%s expects a numerical value"
+msgstr ""
-#: diff.c:5772
+#: diff.c:4721
#, c-format
msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: dir.c:569
+#: diff.c:4806
#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: dir.c:958
+#: diff.c:4830
#, c-format
-msgid "cannot use %s as an exclude file"
+msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: dir.c:1873
+#: diff.c:4844
#, c-format
-msgid "could not open directory '%s'"
-msgstr "не удалось открыть каталог «%s»"
-
-#: dir.c:2115
-msgid "failed to get kernel name and information"
-msgstr "не удалось получить имя ядра и информацию"
-
-#: dir.c:2239
-msgid "untracked cache is disabled on this system or location"
+msgid "unable to resolve '%s'"
msgstr ""
-#: dir.c:3037
+#: diff.c:4894 diff.c:4900
#, c-format
-msgid "index file corrupt in repo %s"
+msgid "%s expects <n>/<m> form"
msgstr ""
-#: dir.c:3082 dir.c:3087
+#: diff.c:4912
#, c-format
-msgid "could not create directories for %s"
-msgstr "не удалось создать каталоги для %s"
+msgid "%s expects a character, got '%s'"
+msgstr ""
-#: dir.c:3116
+#: diff.c:4933
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "не удалось переместить каталог git с «%s» в «%s»"
+msgid "bad --color-moved argument: %s"
+msgstr ""
-#: editor.c:61
+#: diff.c:4952
#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c"
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
-#: entry.c:178
-msgid "Filtering content"
-msgstr "Фильтруется содержимое"
+#: diff.c:4992
+msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
+msgstr ""
-#: entry.c:437
+#: diff.c:5028 diff.c:5048
#, c-format
-msgid "could not stat file '%s'"
-msgstr "не удалось выполнить stat для файла «%s»"
+msgid "invalid argument to %s"
+msgstr ""
-#: environment.c:150
+#: diff.c:5186
#, c-format
-msgid "bad git namespace path \"%s\""
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: environment.c:332
+#: diff.c:5242
#, c-format
-msgid "could not set GIT_DIR to '%s'"
+msgid "bad --word-diff argument: %s"
msgstr ""
-#: exec-cmd.c:361
-#, c-format
-msgid "too many args to run %s"
+#: diff.c:5265
+msgid "Diff output format options"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Внешний репозиторий без URL"
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
+msgstr ""
-#: fetch-pack.c:152
-msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: ожидается передача списка для получение части"
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
+msgstr "не выводить список изменений"
-#: fetch-pack.c:164
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
+msgstr ""
-#: fetch-pack.c:184
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
+msgstr ""
-#: fetch-pack.c:254
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc требует multi_ack_detailed"
+#: diff.c:5281
+msgid "generate the diff in raw format"
+msgstr ""
-#: fetch-pack.c:342 fetch-pack.c:1257
-#, c-format
-msgid "invalid shallow line: %s"
-msgstr "неправильная строка частичного получения: %s"
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
+msgstr ""
-#: fetch-pack.c:348 fetch-pack.c:1263
-#, c-format
-msgid "invalid unshallow line: %s"
-msgstr "неправильная строка полного получения: %s"
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
+msgstr ""
-#: fetch-pack.c:350 fetch-pack.c:1265
-#, c-format
-msgid "object not found: %s"
-msgstr "объект не найден: %s"
+#: diff.c:5292
+msgid "machine friendly --stat"
+msgstr ""
-#: fetch-pack.c:353 fetch-pack.c:1268
-#, c-format
-msgid "error in object: %s"
-msgstr "ошибка в объекте: %s"
+#: diff.c:5295
+msgid "output only the last line of --stat"
+msgstr ""
-#: fetch-pack.c:355 fetch-pack.c:1270
-#, c-format
-msgid "no shallow found: %s"
-msgstr "частичный клон не найден: %s"
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
+msgstr ""
-#: fetch-pack.c:358 fetch-pack.c:1273
-#, c-format
-msgid "expected shallow/unshallow, got %s"
-msgstr "ожидалось shallow/unshallow, а получено %s"
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
-#: fetch-pack.c:399
-#, c-format
-msgid "got %s %d %s"
-msgstr "получено %s %d %s"
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
+msgstr ""
-#: fetch-pack.c:416
-#, c-format
-msgid "invalid commit %s"
-msgstr "недопустимый коммит %s"
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
-#: fetch-pack.c:447
-msgid "giving up"
-msgstr "останавливаю дальнейшие попытки"
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
-#: fetch-pack.c:459 progress.c:229
-msgid "done"
-msgstr "гоÑ\82ово"
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "кÑ\80аÑ\82каÑ\8f Ñ\81водка изменений, вÑ\80оде Ñ\81озданий, пеÑ\80еименований или изменений Ñ\80ежима доÑ\81Ñ\82Ñ\83па"
-#: fetch-pack.c:471
-#, c-format
-msgid "got %s (%d) %s"
-msgstr "получено %s (%d) %s"
+#: diff.c:5316
+msgid "show only names of changed files"
+msgstr ""
-#: fetch-pack.c:517
-#, c-format
-msgid "Marking %s as complete"
-msgstr "Помечаю %s как завершенный"
+#: diff.c:5319
+msgid "show only names and status of changed files"
+msgstr ""
-#: fetch-pack.c:764
-#, c-format
-msgid "already have %s (%s)"
-msgstr "уже есть %s (%s)"
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
-#: fetch-pack.c:803
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: не удалось запустить программу разбора данных"
+#: diff.c:5322
+msgid "generate diffstat"
+msgstr ""
-#: fetch-pack.c:811
-msgid "protocol error: bad pack header"
-msgstr "ошибка протокола: неправильный заголовок потока"
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
+msgstr ""
-#: fetch-pack.c:879
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: не удалось запустить программу %s"
+#: diff.c:5325
+msgid "generate diffstat with a given width"
+msgstr ""
-#: fetch-pack.c:895
-#, c-format
-msgid "%s failed"
-msgstr "%s завершен с ошибкой"
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
+msgstr ""
-#: fetch-pack.c:897
-msgid "error in sideband demultiplexer"
-msgstr "произошла ошибка в программе разбора данных"
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
+msgstr ""
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
-msgstr "Сервер не поддерживает клиентов с частичным клонированием"
+#: diff.c:5333
+msgid "<count>"
+msgstr ""
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
-msgstr "Сервер поддерживает multi_ack_detailed"
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
+msgstr ""
-#: fetch-pack.c:933
-msgid "Server supports no-done"
-msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 no-done"
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
+msgstr "генеÑ\80аÑ\86иÑ\8f компакÑ\82ной Ñ\81водки изменений в diffstat"
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
-msgstr "Сервер поддерживает multi_ack"
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
+msgstr ""
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
-msgstr "Сервер поддерживает side-band-64k"
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
-#: fetch-pack.c:947
-msgid "Server supports side-band"
-msgstr "Сервер поддерживает side-band"
+#: diff.c:5345
+msgid "show colored diff"
+msgstr ""
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Сервер поддерживает allow-tip-sha1-in-want"
+#: diff.c:5346
+msgid "<kind>"
+msgstr ""
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
-msgstr "Сервер поддерживает ofs-delta"
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
-#: fetch-pack.c:971 fetch-pack.c:1150
-msgid "Server supports filter"
-msgstr "Сервер поддерживает фильтрацию"
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
+msgstr ""
-#: fetch-pack.c:979
-#, c-format
-msgid "Server version is %.*s"
-msgstr "Версия сервера %.*s"
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
-#: fetch-pack.c:985
-msgid "Server does not support --shallow-since"
-msgstr "Сервер не поддерживает --shallow-since"
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
-#: fetch-pack.c:989
-msgid "Server does not support --shallow-exclude"
-msgstr "Сервер не поддерживает --shallow-exclude"
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
+msgstr ""
-#: fetch-pack.c:991
-msgid "Server does not support --deepen"
-msgstr "Сервер не поддерживает --deepen"
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
+msgstr ""
-#: fetch-pack.c:1004
-msgid "no common commits"
-msgstr "не общих коммитов"
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
-#: fetch-pack.c:1016 fetch-pack.c:1393
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: ошибка при получении данных."
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
+msgstr ""
-#: fetch-pack.c:1145
-msgid "Server does not support shallow requests"
-msgstr "Сервер не поддерживает частичные запросы"
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
-#: fetch-pack.c:1191
-#, c-format
-msgid "error reading section header '%s'"
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: fetch-pack.c:1197
-#, c-format
-msgid "expected '%s', received '%s'"
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: fetch-pack.c:1236
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
+#: diff.c:5384
+msgid "Diff rename options"
msgstr ""
-#: fetch-pack.c:1241
-#, c-format
-msgid "error processing acks: %d"
+#: diff.c:5385
+msgid "<n>[/<m>]"
msgstr ""
-#: fetch-pack.c:1278
-#, c-format
-msgid "error processing shallow info: %d"
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: fetch-pack.c:1294
-#, c-format
-msgid "expected wanted-ref, got '%s'"
+#: diff.c:5390
+msgid "detect renames"
msgstr ""
-#: fetch-pack.c:1304
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
+#: diff.c:5394
+msgid "omit the preimage for deletes"
msgstr ""
-#: fetch-pack.c:1308
-#, c-format
-msgid "error processing wanted refs: %d"
+#: diff.c:5397
+msgid "detect copies"
msgstr ""
-#: fetch-pack.c:1603
-msgid "no matching remote head"
-msgstr "нет соотвествующего внешнего указателя на ветку"
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
+msgstr ""
-#: fetch-pack.c:1621 builtin/clone.c:664
-msgid "remote did not send all necessary objects"
-msgstr "внешний репозиторий прислал не все необходимые объекты"
+#: diff.c:5403
+msgid "disable rename detection"
+msgstr ""
-#: fetch-pack.c:1647
-#, c-format
-msgid "no such remote ref %s"
-msgstr "нет такой внешней ссылки %s"
+#: diff.c:5406
+msgid "use empty blobs as rename source"
+msgstr ""
-#: fetch-pack.c:1650
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
-msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
-#: gpg-interface.c:253
-msgid "gpg failed to sign the data"
-msgstr "gpg не удалось подписать данные"
+#: diff.c:5411
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
-#: gpg-interface.c:279
-msgid "could not create temporary file"
-msgstr "не удалось создать временный файл"
+#: diff.c:5413
+msgid "Diff algorithm options"
+msgstr ""
-#: gpg-interface.c:282
-#, c-format
-msgid "failed writing detached signature to '%s'"
-msgstr "сбой записи отсоединенной подписи в «%s»"
+#: diff.c:5415
+msgid "produce the smallest possible diff"
+msgstr ""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
+msgstr ""
-#: grep.c:2115
-#, c-format
-msgid "'%s': unable to read %s"
-msgstr "«%s»: не удалось прочесть %s"
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
+msgstr ""
-#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
-#, c-format
-msgid "failed to stat '%s'"
-msgstr "не удалось выполнить stat «%s»"
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
-#: grep.c:2143
-#, c-format
-msgid "'%s': short read"
-msgstr "«%s»: слишком мало данных прочитано"
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
+msgstr ""
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
-msgstr "создание рабочей области (смотрите также: git help tutorial)"
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
+msgstr ""
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
-msgstr "работа с текущими изменениями (смотрите также: git help everyday)"
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
-#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)"
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
-#: help.c:26
-msgid "grow, mark and tweak your common history"
-msgstr "выращивание, отметка и настройка вашей общей истории"
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
-#: help.c:27
-msgid "collaborate (see also: git help workflows)"
-msgstr "совместная работа (смотрите также: git help workflows)"
+#: diff.c:5442
+msgid "<algorithm>"
+msgstr ""
-#: help.c:31
-msgid "Main Porcelain Commands"
-msgstr "Основные машиночитаемые команды"
+#: diff.c:5443
+msgid "choose a diff algorithm"
+msgstr ""
-#: help.c:32
-msgid "Ancillary Commands / Manipulators"
-msgstr "Вспомогательные команды / Манипуляторы"
+#: diff.c:5445
+msgid "<text>"
+msgstr ""
-#: help.c:33
-msgid "Ancillary Commands / Interrogators"
-msgstr "Вспомогательные команды / Запросчики"
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
-#: help.c:34
-msgid "Interacting with Others"
-msgstr "Взаимодействие с другими"
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
+msgstr ""
-#: help.c:35
-msgid "Low-level Commands / Manipulators"
-msgstr "Низкоуровневые команды / Манипуляторы"
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
-#: help.c:36
-msgid "Low-level Commands / Interrogators"
-msgstr "Низкоуровневые команды / Запросчики"
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
+msgstr ""
-#: help.c:37
-msgid "Low-level Commands / Synching Repositories"
-msgstr "Низкоуровневые команды / Синхронизация репозиториев"
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
+msgstr ""
-#: help.c:38
-msgid "Low-level Commands / Internal Helpers"
-msgstr "Низкоуровневые команды / Внутренние вспомогательные"
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
-#: help.c:293
-#, c-format
-msgid "available git commands in '%s'"
-msgstr "доступные команды git в «%s»"
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
+msgstr ""
-#: help.c:300
-msgid "git commands available from elsewhere on your $PATH"
-msgstr "команды git, доступные в других местах вашего $PATH"
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
-#: help.c:309
-msgid "These are common Git commands used in various situations:"
-msgstr "Стандартные команды Git используемые в различных ситуациях:"
+#: diff.c:5464
+msgid "Other diff options"
+msgstr ""
-#: help.c:358 git.c:90
-#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr "неподдерживаемый тип списка команд «%s»"
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
-#: help.c:405
-msgid "The common Git guides are:"
-msgstr "Основные руководства Git:"
+#: diff.c:5470
+msgid "treat all files as text"
+msgstr ""
-#: help.c:552
-#, 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 не работает?"
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
+msgstr ""
-#: help.c:611
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
-#: help.c:633
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
+#: diff.c:5476
+msgid "disable all output of the program"
+msgstr ""
-#: help.c:638
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
+msgstr ""
-#: help.c:643
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
-#: help.c:651
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» не является командой git. Смотрите «git --help»."
+#: diff.c:5482
+msgid "<when>"
+msgstr ""
-#: help.c:655
-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Самые похожие команды:"
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
-#: help.c:670
-msgid "git version [<options>]"
-msgstr "git version [<options>]"
+#: diff.c:5486
+msgid "<format>"
+msgstr ""
-#: help.c:738
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s — %s"
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
+msgstr ""
-#: help.c:742
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] "\nВозможно, вы имели в виду это?"
-msgstr[1] "\nВозможно, вы имели в виду что-то из этого?"
-msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
-msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
-#: ident.c:342
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr "\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"
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
-msgstr "адрес электронной почты не указан и автоопределение отключено"
+#: diff.c:5496
+msgid "<string>"
+msgstr ""
-#: ident.c:371
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
-msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
+#: diff.c:5497
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
-msgstr "имя не указано и автоопределение отключено"
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
-#: ident.c:387
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
-msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
-#: ident.c:395
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
-msgstr "пустое имя идентификатора (для <%s>) не разрешено"
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
-#: ident.c:401
-#, c-format
-msgid "name consists only of disallowed characters: %s"
-msgstr "имя состоит только из неразрешенных симоволов: %s"
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
+msgstr ""
-#: ident.c:416 builtin/commit.c:600
-#, c-format
-msgid "invalid date format: %s"
-msgstr "неправильный формат даты: %s"
+#: diff.c:5510
+msgid "<object-id>"
+msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
+#: diff.c:5511
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
-#: list-objects-filter-options.c:126
-msgid "cannot change partial clone promisor remote"
-msgstr "нельзя изменить внешний репозиторий при частичном клонировании"
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
-#: lockfile.c:151
-#, c-format
-msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
-msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения."
+#: diff.c:5514
+msgid "select files by diff type"
+msgstr ""
-#: lockfile.c:159
-#, c-format
-msgid "Unable to create '%s.lock': %s"
-msgstr "Не удалось создать «%s.lock»: %s"
+#: diff.c:5516
+msgid "<file>"
+msgstr ""
-#: merge.c:40
-msgid "failed to read the cache"
-msgstr "сбой чтения кэша"
+#: diff.c:5517
+msgid "Output to a specific file"
+msgstr ""
-#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
-#: builtin/checkout.c:608 builtin/clone.c:763
-msgid "unable to write new index file"
-msgstr "не удалось записать новый файл индекса"
+#: diff.c:6150
+msgid "inexact rename detection was skipped due to too many files."
+msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-#: merge-recursive.c:303
-msgid "(bad commit)\n"
-msgstr "(плохой коммит)\n"
+#: diff.c:6153
+msgid "only found copies from modified paths due to too many files."
+msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
-#: merge-recursive.c:325
+#: diff.c:6156
#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния."
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
-#: merge-recursive.c:333
+#: dir.c:537
#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния."
-
-#: merge-recursive.c:415
-msgid "error building trees"
-msgstr "ошибка при построении деревьев"
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
-#: merge-recursive.c:886
+#: dir.c:926
#, c-format
-msgid "failed to create path '%s'%s"
-msgstr "не удалось создать путь «%s»%s"
+msgid "cannot use %s as an exclude file"
+msgstr ""
-#: merge-recursive.c:897
+#: dir.c:1843
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr "Удаление %s, Ñ\87Ñ\82обÑ\8b оÑ\81вободиÑ\82Ñ\8c меÑ\81Ñ\82о длÑ\8f подкаÑ\82алогов\n"
+msgid "could not open directory '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c каÑ\82алог «%s»"
-#: merge-recursive.c:911 merge-recursive.c:930
-msgid ": perhaps a D/F conflict?"
-msgstr ": возможно, конфликт каталогов/файлов?"
+#: dir.c:2085
+msgid "failed to get kernel name and information"
+msgstr "не удалось получить имя ядра и информацию"
-#: merge-recursive.c:920
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr "отказ потери неотслеживаемого файла в «%s»"
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
-#: merge-recursive.c:962 builtin/cat-file.c:39
+#: dir.c:3013
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr "невозможно прочитать объект %s «%s»"
+msgid "index file corrupt in repo %s"
+msgstr ""
-#: merge-recursive.c:964
+#: dir.c:3058 dir.c:3063
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "ожидаеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bй обÑ\8aекÑ\82 длÑ\8f %s «%s»"
+msgid "could not create directories for %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c каÑ\82алоги длÑ\8f %s"
-#: merge-recursive.c:988
+#: dir.c:3092
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s»: %s"
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пеÑ\80емеÑ\81Ñ\82иÑ\82Ñ\8c каÑ\82алог git Ñ\81 «%s» в «%s»"
-#: merge-recursive.c:999
+#: editor.c:73
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c Ñ\81имволÑ\8cнÑ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 «%s»: %s"
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "подÑ\81казка: Ð\9eжидание, пока вÑ\8b закÑ\80оеÑ\82е Ñ\80едакÑ\82оÑ\80 Ñ\81 Ñ\84айломâ\80¦%c"
-#: merge-recursive.c:1004
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr "не понятно, что делать с %06o %s «%s»"
+#: entry.c:178
+msgid "Filtering content"
+msgstr "Фильтруется содержимое"
-#: merge-recursive.c:1191
+#: entry.c:476
#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (Ñ\81оÑ\81Ñ\82оÑ\8fние не забÑ\80ано)"
+msgid "could not stat file '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat длÑ\8f Ñ\84айла «%s»"
-#: merge-recursive.c:1198
+#: environment.c:150
#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Не удалось слить подмодуль %s (нет коммитов)"
+msgid "bad git namespace path \"%s\""
+msgstr ""
-#: merge-recursive.c:1205
+#: environment.c:332
#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)"
+msgid "could not set GIT_DIR to '%s'"
+msgstr ""
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: exec-cmd.c:363
#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Перемотка вперед подмодуля %s до указанного коммита:"
+msgid "too many args to run %s"
+msgstr ""
-#: merge-recursive.c:1216 merge-recursive.c:1228
-#, c-format
-msgid "Fast-forwarding submodule %s"
-msgstr "Перемотка вперед подмодуля %s"
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr "Внешний репозиторий без URL"
-#: merge-recursive.c:1250
-#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: ожидается передача списка для получение части"
-#: merge-recursive.c:1254
-#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
-#: merge-recursive.c:1255
-msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
-#: merge-recursive.c:1258
+#: fetch-pack.c:185
#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
-#: merge-recursive.c:1267
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr ""
-#: merge-recursive.c:1326
-msgid "Failed to execute internal merge"
-msgstr "Не удалось запустить внутреннее слияние"
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc требует multi_ack_detailed"
-#: merge-recursive.c:1331
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
-msgid "Unable to add %s to database"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c добавиÑ\82Ñ\8c %s в базÑ\83 даннÑ\8bÑ\85"
+msgid "invalid shallow line: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока Ñ\87аÑ\81Ñ\82иÑ\87ного полÑ\83Ñ\87ениÑ\8f: %s"
-#: merge-recursive.c:1363
+#: fetch-pack.c:366 fetch-pack.c:1277
#, c-format
-msgid "Auto-merging %s"
-msgstr "Ð\90вÑ\82оÑ\81лиÑ\8fние %s"
+msgid "invalid unshallow line: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\82Ñ\80ока полного полÑ\83Ñ\87ениÑ\8f: %s"
-#: merge-recursive.c:1434
+#: fetch-pack.c:368 fetch-pack.c:1279
#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Ð\9eÑ\88ибка: Ð\9eÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла %s; запиÑ\81Ñ\8c в %s взамен."
+msgid "object not found: %s"
+msgstr "обÑ\8aекÑ\82 не найден: %s"
-#: merge-recursive.c:1501
+#: fetch-pack.c:371 fetch-pack.c:1282
#, 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 оставлена в дереве."
+msgid "error in object: %s"
+msgstr "ошибка в объекте: %s"
-#: merge-recursive.c:1506
+#: fetch-pack.c:373 fetch-pack.c:1284
#, 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 оставлена в дереве."
+msgid "no shallow found: %s"
+msgstr "частичный клон не найден: %s"
-#: merge-recursive.c:1513
+#: fetch-pack.c:376 fetch-pack.c:1288
#, 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."
+msgid "expected shallow/unshallow, got %s"
+msgstr "ожидалось shallow/unshallow, а получено %s"
-#: merge-recursive.c:1518
+#: fetch-pack.c:417
#, 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."
+msgid "got %s %d %s"
+msgstr "получено %s %d %s"
-#: merge-recursive.c:1552
-msgid "rename"
-msgstr "переименование"
+#: fetch-pack.c:434
+#, c-format
+msgid "invalid commit %s"
+msgstr "недопустимый коммит %s"
-#: merge-recursive.c:1552
-msgid "renamed"
-msgstr "пеÑ\80еименовано"
+#: fetch-pack.c:465
+msgid "giving up"
+msgstr "оÑ\81Ñ\82анавливаÑ\8e далÑ\8cнейÑ\88ие попÑ\8bÑ\82ки"
-#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
-#: merge-recursive.c:3129
-#, c-format
-msgid "Refusing to lose dirty file at %s"
-msgstr "Отказ потери измененного файла %s"
+#: fetch-pack.c:477 progress.c:284
+msgid "done"
+msgstr "готово"
-#: merge-recursive.c:1620
+#: fetch-pack.c:489
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
-msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
+msgid "got %s (%d) %s"
+msgstr "получено %s (%d) %s"
-#: merge-recursive.c:1625
+#: fetch-pack.c:535
#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "Ð\9eÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла %s; добавление как %s взамен."
+msgid "Marking %s as complete"
+msgstr "Ð\9fомеÑ\87аÑ\8e %s как завеÑ\80Ñ\88еннÑ\8bй"
-#: merge-recursive.c:1651
+#: fetch-pack.c:744
#, 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:1656
-msgid " (left unresolved)"
-msgstr " (оставлено неразрешенным)"
-
-#: merge-recursive.c:1720
-#, 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:1759
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Переименовываю %s в %s и %s в %s вместо этого"
+msgid "already have %s (%s)"
+msgstr "уже есть %s (%s)"
-#: merge-recursive.c:1771
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: не удалось запустить программу разбора данных"
-#: merge-recursive.c:1977
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
-msgstr ""
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
+msgstr "ошибка протокола: неправильный заголовок потока"
-#: merge-recursive.c:2009
+#: fetch-pack.c:859
#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: не удалось запустить программу %s"
-#: merge-recursive.c:2019
+#: fetch-pack.c:875
#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
+msgid "%s failed"
+msgstr "%s завершен с ошибкой"
-#: merge-recursive.c:2111
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
-"%s->%s in %s"
-msgstr ""
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
+msgstr "произошла ошибка в программе разбора данных"
-#: merge-recursive.c:2356
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
+#: fetch-pack.c:906
+msgid "Server does not support shallow clients"
+msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-#: merge-recursive.c:2762
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
+#: fetch-pack.c:910
+msgid "Server supports multi_ack_detailed"
+msgstr "Сервер поддерживает multi_ack_detailed"
-#: merge-recursive.c:2777
-#, c-format
-msgid "Adding merged %s"
-msgstr "Добавление слитого %s"
+#: fetch-pack.c:913
+msgid "Server supports no-done"
+msgstr "Сервер поддерживает no-done"
-#: merge-recursive.c:2784 merge-recursive.c:3132
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Добавление вместо этого как %s"
+#: fetch-pack.c:919
+msgid "Server supports multi_ack"
+msgstr "Сервер поддерживает multi_ack"
-#: merge-recursive.c:2941
-#, c-format
-msgid "cannot read object %s"
-msgstr "невозможно прочитать объект «%s»"
+#: fetch-pack.c:923
+msgid "Server supports side-band-64k"
+msgstr "Сервер поддерживает side-band-64k"
-#: merge-recursive.c:2944
-#, c-format
-msgid "object %s is not a blob"
-msgstr "объект %s не является двоичным объектом"
+#: fetch-pack.c:927
+msgid "Server supports side-band"
+msgstr "Сервер поддерживает side-band"
-#: merge-recursive.c:3013
-msgid "modify"
-msgstr "изменение"
+#: fetch-pack.c:931
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 allow-tip-sha1-in-want"
-#: merge-recursive.c:3013
-msgid "modified"
-msgstr "изменено"
+#: fetch-pack.c:935
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 allow-reachable-sha1-in-want"
-#: merge-recursive.c:3024
-msgid "content"
-msgstr "содержимое"
+#: fetch-pack.c:945
+msgid "Server supports ofs-delta"
+msgstr "Сервер поддерживает ofs-delta"
-#: merge-recursive.c:3031
-msgid "add/add"
-msgstr "добавление/добавление"
+#: fetch-pack.c:951 fetch-pack.c:1144
+msgid "Server supports filter"
+msgstr "СеÑ\80веÑ\80 поддеÑ\80живаеÑ\82 Ñ\84илÑ\8cÑ\82Ñ\80аÑ\86иÑ\8e"
-#: merge-recursive.c:3076
+#: fetch-pack.c:959
#, c-format
-msgid "Skipped %s (merged same as existing)"
-msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-
-#: merge-recursive.c:3098 git-submodule.sh:865
-msgid "submodule"
-msgstr "подмодуль"
+msgid "Server version is %.*s"
+msgstr "Версия сервера %.*s"
-#: merge-recursive.c:3099
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-since"
+msgstr "Сервер не поддерживает --shallow-since"
-#: merge-recursive.c:3221
-#, c-format
-msgid "Removing %s"
-msgstr "Удаление %s"
+#: fetch-pack.c:969
+msgid "Server does not support --shallow-exclude"
+msgstr "Сервер не поддерживает --shallow-exclude"
-#: merge-recursive.c:3247
-msgid "file/directory"
-msgstr "файл/каталог"
+#: fetch-pack.c:971
+msgid "Server does not support --deepen"
+msgstr "Сервер не поддерживает --deepen"
-#: merge-recursive.c:3253
-msgid "directory/file"
-msgstr "каÑ\82алог/Ñ\84айл"
+#: fetch-pack.c:988
+msgid "no common commits"
+msgstr "не обÑ\89иÑ\85 коммиÑ\82ов"
-#: merge-recursive.c:3260
-#, c-format
-msgid ""
-"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
+#: fetch-pack.c:1000 fetch-pack.c:1449
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: ошибка при получении данных."
-#: merge-recursive.c:3269
-#, c-format
-msgid "Adding %s"
-msgstr "Добавление %s"
+#: fetch-pack.c:1138
+msgid "Server does not support shallow requests"
+msgstr "Сервер не поддерживает частичные запросы"
-#: merge-recursive.c:3303
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
msgstr ""
-#: merge-recursive.c:3314
-msgid "Already up to date!"
-msgstr "Уже обновлено!"
-
-#: merge-recursive.c:3323
-#, c-format
-msgid "merging of trees %s and %s failed"
-msgstr "сбой слияния деревьев «%s» и «%s»"
-
-#: merge-recursive.c:3422
-msgid "Merging:"
-msgstr "Слияние:"
-
-#: merge-recursive.c:3435
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] "найден %u общий предок:"
-msgstr[1] "найдено %u общих предка:"
-msgstr[2] "найдено %u общих предков:"
-msgstr[3] "найдено %u общих предков:"
-
-#: merge-recursive.c:3474
-msgid "merge returned no commit"
-msgstr "слияние не вернуло коммит"
-
-#: merge-recursive.c:3540
-#, c-format
-msgid "Could not parse object '%s'"
-msgstr "Не удалось разобрать объект «%s»"
-
-#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
-msgid "Unable to write index."
-msgstr "Не удается записать индекс."
-
-#: notes-merge.c:274
+#: fetch-pack.c:1189
#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
-msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
+msgid "error reading section header '%s'"
+msgstr ""
-#: notes-merge.c:281
+#: fetch-pack.c:1195
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
-
-#: notes-utils.c:45
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
+msgid "expected '%s', received '%s'"
+msgstr ""
-#: notes-utils.c:104
+#: fetch-pack.c:1234
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Неправильное значение notes.rewriteMode: «%s»"
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
-#: notes-utils.c:114
+#: fetch-pack.c:1239
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
+msgid "error processing acks: %d"
+msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#: notes-utils.c:144
-#, c-format
-msgid "Bad %s value: '%s'"
-msgstr "Неправильное значение переменной %s: «%s»"
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
-#: object.c:54
-#, c-format
-msgid "invalid object type \"%s\""
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: object.c:173
+#: fetch-pack.c:1293
#, c-format
-msgid "object %s is a %s, not a %s"
+msgid "error processing shallow info: %d"
msgstr ""
-#: object.c:233
+#: fetch-pack.c:1340
#, c-format
-msgid "object %s has unknown type id %d"
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: object.c:246
+#: fetch-pack.c:1345
#, c-format
-msgid "unable to parse object: %s"
-msgstr "не удалось разобрать объект: %s"
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
-#: object.c:266 object.c:277
+#: fetch-pack.c:1350
#, c-format
-msgid "sha1 mismatch %s"
+msgid "error processing wanted refs: %d"
msgstr ""
-#: packfile.c:563
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
+#: fetch-pack.c:1676
+msgid "no matching remote head"
+msgstr "нет соотвествующего внешнего указателя на ветку"
-#: packfile.c:1745
+#: fetch-pack.c:1699 builtin/clone.c:673
+msgid "remote did not send all necessary objects"
+msgstr "внешний репозиторий прислал не все необходимые объекты"
+
+#: fetch-pack.c:1726
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
+msgid "no such remote ref %s"
+msgstr "нет такой внешней ссылки %s"
-#: packfile.c:1749
+#: fetch-pack.c:1729
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
-#: parse-options.c:672
-msgid "..."
-msgstr "…"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
+msgstr "gpg не удалось подписать данные"
-#: parse-options.c:691
-#, c-format
-msgid "usage: %s"
-msgstr "использование: %s"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
+msgstr "не удалось создать временный файл"
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#: parse-options.c:697
+#: gpg-interface.c:347
#, c-format
-msgid " or: %s"
-msgstr " или: %s"
+msgid "failed writing detached signature to '%s'"
+msgstr "сбой записи отсоединенной подписи в «%s»"
-#: parse-options.c:700
+#: graph.c:97
#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:739
-msgid "-NUM"
-msgstr "-КОЛИЧЕСТВО"
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
-#: parse-options-cb.c:44
+#: grep.c:2113
#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
+msgid "'%s': unable to read %s"
+msgstr "«%s»: не удалось прочесть %s"
-#: parse-options-cb.c:112
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "malformed object name '%s'"
-msgstr "Ð\9dепÑ\80авилÑ\8cное имÑ\8f обÑ\8aекÑ\82а «%s»"
+msgid "failed to stat '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat «%s»"
-#: path.c:892
+#: grep.c:2141
#, c-format
-msgid "Could not make %s writable by group"
-msgstr "Не удалось предоставить доступ к %s на запись"
+msgid "'%s': short read"
+msgstr "«%s»: слишком мало данных прочитано"
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "создание рабочей области (смотрите также: git help tutorial)"
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
-msgstr "Разрешен только один спецификатор «attr:»."
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "работа с текущими изменениями (смотрите также: git help everyday)"
-#: pathspec.c:150
-msgid "attr spec must not be empty"
-msgstr "спецификатор attr не должен быть пустой"
-
-#: pathspec.c:193
-#, c-format
-msgid "invalid attribute name %s"
-msgstr "недопустимое имя атрибута %s"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)"
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "глобалÑ\8cнÑ\8bе опÑ\86ии Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80ов пÑ\83Ñ\82и «glob» и «noglob» нелÑ\8cзÑ\8f иÑ\81полÑ\8cзоваÑ\82Ñ\8c одновÑ\80еменно"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "вÑ\8bÑ\80аÑ\89ивание, оÑ\82меÑ\82ка и наÑ\81Ñ\82Ñ\80ойка ваÑ\88ей обÑ\89ей иÑ\81Ñ\82оÑ\80ии"
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "совместная работа (смотрите также: git help workflows)"
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "непÑ\80авилÑ\8cнÑ\8bй паÑ\80амеÑ\82Ñ\80 длÑ\8f магиÑ\87еÑ\81кого Ñ\81лова «prefix» в Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80е пÑ\83Ñ\82и "
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Ð\9eÑ\81новнÑ\8bе маÑ\88иноÑ\87иÑ\82аемÑ\8bе командÑ\8b"
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Вспомогательные команды / Манипуляторы"
-#: pathspec.c:331
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Вспомогательные команды / Запросчики"
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»"
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Взаимодействие с другими"
-#: pathspec.c:428
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
-msgstr "%s: «literal» и «glob» не совместимы"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Низкоуровневые команды / Манипуляторы"
-#: pathspec.c:441
-#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: «%s» вне репозитория"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Низкоуровневые команды / Запросчики"
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
-msgstr "«%s» (мнемоника: «%c»)"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr "Низкоуровневые команды / Синхронизация репозиториев"
-#: pathspec.c:525
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Низкоуровневые команды / Внутренние вспомогательные"
-#: pathspec.c:592
+#: help.c:298
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "спецификатор пути «%s» находится за символической ссылкой"
-
-#: pkt-line.c:104
-msgid "flush packet write failed"
-msgstr ""
-
-#: pkt-line.c:142 pkt-line.c:228
-msgid "protocol error: impossibly long line"
-msgstr ""
-
-#: pkt-line.c:158 pkt-line.c:160
-msgid "packet write with format failed"
-msgstr ""
-
-#: pkt-line.c:192
-msgid "packet write failed - data exceeds max packet size"
-msgstr ""
-
-#: pkt-line.c:199 pkt-line.c:206
-msgid "packet write failed"
-msgstr ""
+msgid "available git commands in '%s'"
+msgstr "доступные команды git в «%s»"
-#: pkt-line.c:291
-msgid "read error"
-msgstr ""
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "команды git, доступные в других местах вашего $PATH"
-#: pkt-line.c:299
-msgid "the remote end hung up unexpectedly"
-msgstr ""
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr "Стандартные команды Git используемые в различных ситуациях:"
-#: pkt-line.c:327
+#: help.c:363 git.c:97
#, c-format
-msgid "protocol error: bad line length character: %.4s"
-msgstr ""
+msgid "unsupported command listing type '%s'"
+msgstr "неподдерживаемый тип списка команд «%s»"
-#: pkt-line.c:337 pkt-line.c:342
-#, c-format
-msgid "protocol error: bad line length %d"
-msgstr ""
+#: help.c:403
+msgid "The common Git guides are:"
+msgstr "Основные руководства Git:"
-#: pretty.c:962
-msgid "unable to parse --pretty format"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c Ñ\84оÑ\80маÑ\82 длÑ\8f --pretty"
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Ð\97апÑ\83Ñ\81Ñ\82иÑ\82е «git help <команда>», Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\87еÑ\81Ñ\82Ñ\8c о конкÑ\80еÑ\82ной подкоманде"
-#: range-diff.c:48
-msgid "could not start `log`"
+#: help.c:517
+msgid "External commands"
msgstr ""
-#: range-diff.c:51
-msgid "could not read `log` output"
+#: help.c:532
+msgid "Command aliases"
msgstr ""
-#: range-diff.c:66 sequencer.c:4540
+#: help.c:596
#, c-format
-msgid "could not parse commit '%s'"
-msgstr "не удалось разобрать коммит «%s»"
-
-#: range-diff.c:196
-msgid "failed to generate diff"
-msgstr ""
+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 не работает?"
-#: range-diff.c:421 range-diff.c:423
-#, c-format
-msgid "could not parse log for '%s'"
-msgstr ""
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
-#: read-cache.c:1579
+#: help.c:677
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
-msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
-#: read-cache.c:1589
+#: help.c:682
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
-msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
-#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
+#: help.c:687
#, c-format
-msgid "could not close '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c закÑ\80Ñ\8bÑ\82Ñ\8c «%s»"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Ð\9fÑ\80одолжÑ\83 Ñ\87еÑ\80ез %0.1f Ñ\81екÑ\83нд, пÑ\80едполагаÑ\8f, Ñ\87Ñ\82о вÑ\8b имели в видÑ\83 «%s»."
-#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
+#: help.c:695
#, c-format
-msgid "could not stat '%s'"
-msgstr "не удалось выполнить stat для «%s»"
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: «%s» не является командой git. Смотрите «git --help»."
-#: read-cache.c:2666
-#, c-format
-msgid "unable to open git dir: %s"
-msgstr "не удалось открыть каталог git: %s"
+#: help.c:699
+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Самые похожие команды:"
-#: read-cache.c:2678
-#, c-format
-msgid "unable to unlink: %s"
-msgstr "не удалось отсоединить: %s"
+#: help.c:714
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
-#: refs.c:192
+#: help.c:782
#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
-#: refs.c:579
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
+#: help.c:786
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] "\nВозможно, вы имели в виду это?"
+msgstr[1] "\nВозможно, вы имели в виду что-то из этого?"
+msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
+msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
-#: refs.c:581 ref-filter.c:2067
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнорирую неправильную ссылку %s"
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr "\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"
-#: refs.c:685
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "не удалось открыть «%s» для записи: %s"
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr "адрес электронной почты не указан и автоопределение отключено"
-#: refs.c:695 refs.c:746
+#: ident.c:384
#, c-format
-msgid "could not read ref '%s'"
-msgstr ""
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
-#: refs.c:701
-#, c-format
-msgid "ref '%s' already exists"
-msgstr ""
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
+msgstr "имя не указано и автоопределение отключено"
-#: refs.c:706
+#: ident.c:407
#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr ""
+msgid "unable to auto-detect name (got '%s')"
+msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
-#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
-#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
-#: wrapper.c:656
+#: ident.c:415
#, c-format
-msgid "could not write to '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c в «%s»"
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "пÑ\83Ñ\81Ñ\82ое имÑ\8f иденÑ\82иÑ\84икаÑ\82оÑ\80а (длÑ\8f <%s>) не Ñ\80азÑ\80еÑ\88ено"
-#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:780
+#: ident.c:421
#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f запиÑ\81и"
+msgid "name consists only of disallowed characters: %s"
+msgstr "имÑ\8f Ñ\81оÑ\81Ñ\82оиÑ\82 Ñ\82олÑ\8cко из неÑ\80азÑ\80еÑ\88еннÑ\8bÑ\85 Ñ\81имоволов: %s"
-#: refs.c:748
+#: ident.c:436 builtin/commit.c:608
#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr ""
+msgid "invalid date format: %s"
+msgstr "неправильный формат даты: %s"
-#: refs.c:879
+#: list-objects.c:129
#, c-format
-msgid "log for ref %s has gap after %s"
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: refs.c:885
+#: list-objects.c:142
#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: refs.c:943
+#: list-objects.c:378
#, c-format
-msgid "log for %s is empty"
+msgid "unable to load root tree for commit %s"
msgstr ""
-#: refs.c:1035
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
-#: refs.c:1111
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: refs.c:1853
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
msgstr ""
-#: refs.c:1885
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновление Ñ\81Ñ\81Ñ\8bлок запÑ\80еÑ\89ено в изолиÑ\80ованном окÑ\80Ñ\83жении"
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
+msgstr "нелÑ\8cзÑ\8f измениÑ\82Ñ\8c внеÑ\88ний Ñ\80епозиÑ\82оÑ\80ий пÑ\80и Ñ\87аÑ\81Ñ\82иÑ\87ном клониÑ\80овании"
-#: refs.c:1981 refs.c:2011
+#: lockfile.c:151
#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения."
-#: refs.c:1987 refs.c:2022
+#: lockfile.c:159
#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
+msgid "Unable to create '%s.lock': %s"
+msgstr "Не удалось создать «%s.lock»: %s"
-#: refs/files-backend.c:1191
-#, c-format
-msgid "could not remove reference %s"
-msgstr "не удалось удалить ссылки %s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "сбой чтения кэша"
-#: refs/files-backend.c:1205 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "не удалось удалить ссылку %s: %s"
+#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
+#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: builtin/stash.c:264
+msgid "unable to write new index file"
+msgstr "не удалось записать новый файл индекса"
-#: refs/files-backend.c:1208 refs/packed-backend.c:1545
-#, c-format
-msgid "could not delete references: %s"
-msgstr "не удалось удалить ссылки: %s"
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
+msgstr "(плохой коммит)\n"
-#: refspec.c:137
+#: merge-recursive.c:345
#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: ref-filter.c:38 wt-status.c:1850
-msgid "gone"
-msgstr "исчез"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния."
-#: ref-filter.c:39
+#: merge-recursive.c:354
#, c-format
-msgid "ahead %d"
-msgstr "впереди %d"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния."
-#: ref-filter.c:40
-#, c-format
-msgid "behind %d"
-msgstr "позади %d"
+#: merge-recursive.c:437
+msgid "error building trees"
+msgstr "ошибка при построении деревьев"
-#: ref-filter.c:41
+#: merge-recursive.c:861
#, c-format
-msgid "ahead %d, behind %d"
-msgstr "впеÑ\80еди %d, позади %d"
+msgid "failed to create path '%s'%s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c пÑ\83Ñ\82Ñ\8c «%s»%s"
-#: ref-filter.c:137
+#: merge-recursive.c:872
#, c-format
-msgid "expected format: %%(color:<color>)"
-msgstr "ожидаемÑ\8bй Ñ\84оÑ\80маÑ\82: %%(color:<color>)"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Удаление %s, Ñ\87Ñ\82обÑ\8b оÑ\81вободиÑ\82Ñ\8c меÑ\81Ñ\82о длÑ\8f подкаÑ\82алогов\n"
-#: ref-filter.c:139
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
-msgstr "неопознанный цвет: %%(color:%s)"
+#: merge-recursive.c:886 merge-recursive.c:905
+msgid ": perhaps a D/F conflict?"
+msgstr ": возможно, конфликт каталогов/файлов?"
-#: ref-filter.c:161
+#: merge-recursive.c:895
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
-msgstr "Ð\9eжидаеÑ\82Ñ\81Ñ\8f Ñ\86елоÑ\87иÑ\81ленное знаÑ\87ение refname:lstrip=%s"
+msgid "refusing to lose untracked file at '%s'"
+msgstr "оÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла в «%s»"
-#: ref-filter.c:165
+#: merge-recursive.c:936 builtin/cat-file.c:40
#, c-format
-msgid "Integer value expected refname:rstrip=%s"
-msgstr "Ð\9eжидаеÑ\82Ñ\81Ñ\8f Ñ\86елоÑ\87иÑ\81ленное знаÑ\87ение refname:rstrip=%s"
+msgid "cannot read object %s '%s'"
+msgstr "невозможно пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 %s «%s»"
-#: ref-filter.c:167
+#: merge-recursive.c:939
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(%s): %s"
+msgid "blob expected for %s '%s'"
+msgstr "ожидаеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bй обÑ\8aекÑ\82 длÑ\8f %s «%s»"
-#: ref-filter.c:222
+#: merge-recursive.c:963
#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr ""
+msgid "failed to open '%s': %s"
+msgstr "не удалось открыть «%s»: %s"
-#: ref-filter.c:234
+#: merge-recursive.c:974
#, c-format
-msgid "%%(objectsize) does not take arguments"
-msgstr ""
+msgid "failed to symlink '%s': %s"
+msgstr "не удалось создать символьную ссылку «%s»: %s"
-#: ref-filter.c:246
+#: merge-recursive.c:979
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "паÑ\80амеÑ\82Ñ\80 %%(body) не пÑ\80инимаеÑ\82 аÑ\80гÑ\83менÑ\82Ñ\8b"
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "не понÑ\8fÑ\82но, Ñ\87Ñ\82о делаÑ\82Ñ\8c Ñ\81 %06o %s «%s»"
-#: ref-filter.c:255
+#: merge-recursive.c:1175
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "паÑ\80амеÑ\82Ñ\80 %%(subject) не пÑ\80инимаеÑ\82 аÑ\80гÑ\83менÑ\82Ñ\8b"
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (Ñ\81оÑ\81Ñ\82оÑ\8fние не забÑ\80ано)"
-#: ref-filter.c:275
+#: merge-recursive.c:1182
#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "неизвеÑ\81Ñ\82нÑ\8bй аÑ\80гÑ\83менÑ\82 длÑ\8f %%(trailers): %s"
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (неÑ\82 коммиÑ\82ов)"
-#: ref-filter.c:304
+#: merge-recursive.c:1189
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "положиÑ\82елÑ\8cное знаÑ\87ение ожидаеÑ\82 contents:lines=%s"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (Ñ\83 коммиÑ\82ов дÑ\80Ñ\83гаÑ\8f база Ñ\81лиÑ\8fниÑ\8f)"
-#: ref-filter.c:306
+#: merge-recursive.c:1197 merge-recursive.c:1209
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(contents): %s"
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Ð\9fеÑ\80емоÑ\82ка впеÑ\80ед подмодÑ\83лÑ\8f %s до Ñ\83казанного коммиÑ\82а:"
-#: ref-filter.c:321
+#: merge-recursive.c:1200 merge-recursive.c:1212
#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "ожидаеÑ\82Ñ\81Ñ\8f положиÑ\82елÑ\8cное знаÑ\87ение objectname:short=%s"
+msgid "Fast-forwarding submodule %s"
+msgstr "Ð\9fеÑ\80емоÑ\82ка впеÑ\80ед подмодÑ\83лÑ\8f %s"
-#: ref-filter.c:325
+#: merge-recursive.c:1235
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(objectname): %s"
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (неÑ\82 Ñ\83казаннÑ\8bÑ\85 коммиÑ\82ов длÑ\8f Ñ\81лиÑ\8fниÑ\8f)"
-#: ref-filter.c:355
+#: merge-recursive.c:1239
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
-msgstr "ожидаемÑ\8bй Ñ\84оÑ\80маÑ\82: %%(align:<width>,<position>)"
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (нелÑ\8cзÑ\8f Ñ\81делаÑ\82Ñ\8c пеÑ\80емоÑ\82кÑ\83 впеÑ\80ед)"
-#: ref-filter.c:367
-#, c-format
-msgid "unrecognized position:%s"
-msgstr "неопознанная позиция:%s"
+#: merge-recursive.c:1240
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
-#: ref-filter.c:374
+#: merge-recursive.c:1243
#, c-format
-msgid "unrecognized width:%s"
-msgstr "неопознанная ширина:%s"
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n"
-#: ref-filter.c:383
+#: merge-recursive.c:1252
#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(align): %s"
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81лиÑ\82Ñ\8c подмодÑ\83лÑ\8c %s (найдено неÑ\81колÑ\8cко Ñ\81лиÑ\8fний)"
-#: ref-filter.c:391
-#, c-format
-msgid "positive width expected with the %%(align) atom"
-msgstr "ожидается положительная ширина с указанием частицы %%(align)"
+#: merge-recursive.c:1325
+msgid "Failed to execute internal merge"
+msgstr "Не удалось запустить внутреннее слияние"
-#: ref-filter.c:409
+#: merge-recursive.c:1330
#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "неопознаннÑ\8bй аÑ\80гÑ\83менÑ\82 %%(if): %s"
+msgid "Unable to add %s to database"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c добавиÑ\82Ñ\8c %s в базÑ\83 даннÑ\8bÑ\85"
-#: ref-filter.c:505
+#: merge-recursive.c:1362
#, c-format
-msgid "malformed field name: %.*s"
-msgstr "непÑ\80авилÑ\8cное имÑ\8f полÑ\8f: %.*s"
+msgid "Auto-merging %s"
+msgstr "Ð\90вÑ\82оÑ\81лиÑ\8fние %s"
-#: ref-filter.c:532
+#: merge-recursive.c:1385
#, c-format
-msgid "unknown field name: %.*s"
-msgstr "неизвеÑ\81Ñ\82ное имÑ\8f полÑ\8f: %.*s"
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "Ð\9eÑ\88ибка: Ð\9eÑ\82каз поÑ\82еÑ\80и неоÑ\82Ñ\81леживаемого Ñ\84айла %s; запиÑ\81Ñ\8c в %s взамен."
-#: ref-filter.c:656
+#: merge-recursive.c:1457
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: частица %%(if) использована без частицы %%(then)"
+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 оставлена в дереве."
-#: ref-filter.c:719
+#: merge-recursive.c:1462
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "формат: частица %%(then) использована без частицы %%(if)"
+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 оставлена в дереве."
-#: ref-filter.c:721
+#: merge-recursive.c:1469
#, c-format
-msgid "format: %%(then) atom used more than once"
-msgstr "формат: частица %%(then) использована более одного раза"
+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."
-#: ref-filter.c:723
+#: merge-recursive.c:1474
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
-msgstr "формат: частица %%(then) использована после %%(else)"
+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."
-#: ref-filter.c:751
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: частица %%(else) использована без частицы %%(if)"
+#: merge-recursive.c:1509
+msgid "rename"
+msgstr "переименование"
-#: ref-filter.c:753
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: частица %%(else) использована без частицы %%(then)"
+#: merge-recursive.c:1509
+msgid "renamed"
+msgstr "переименовано"
-#: ref-filter.c:755
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr "формат: частица %%(else) использована более одного раза"
+msgid "Refusing to lose dirty file at %s"
+msgstr "Отказ потери изменённого файла %s"
-#: ref-filter.c:770
+#: merge-recursive.c:1599
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
-msgstr "формат: частица %%(end) использована без соответствующей частицы"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия."
-#: ref-filter.c:827
+#: merge-recursive.c:1657
#, c-format
-msgid "malformed format string %s"
-msgstr "неправильная строка формата %s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
-#: ref-filter.c:1416
+#: merge-recursive.c:1687
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(нет ветки, перемещение %s)"
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-#: ref-filter.c:1419
+#: merge-recursive.c:1692
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(нет ветки перемещение отделённого HEAD %s)"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен."
-#: ref-filter.c:1422
+#: merge-recursive.c:1711
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(нет ветки, двоичный поиск начат на %s)"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
+msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#: ref-filter.c:1430
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD отделён на %s)"
+#: merge-recursive.c:1716
+msgid " (left unresolved)"
+msgstr " (оставлено неразрешенным)"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#: ref-filter.c:1437
+#: merge-recursive.c:1825
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD отделён начиная с %s)"
-
-#: ref-filter.c:1441
-msgid "(no branch)"
-msgstr "(нет ветки)"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»"
-#: ref-filter.c:1475 ref-filter.c:1623
+#: merge-recursive.c:2030
#, c-format
-msgid "missing object %s for %s"
-msgstr "не найден объект %s для %s"
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
-#: ref-filter.c:1483
+#: merge-recursive.c:2062
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
-msgstr "сбой при выполнении parse_object_buffer на %s для %s"
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
-#: ref-filter.c:1980
+#: merge-recursive.c:2072
#, c-format
-msgid "malformed object at '%s'"
-msgstr "Повреждённый объект «%s»"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
-#: ref-filter.c:2062
+#: merge-recursive.c:2164
#, c-format
-msgid "ignoring ref with broken name %s"
-msgstr "игнорирую ссылку с неправильным именем %s"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+"%s->%s in %s"
+msgstr ""
-#: ref-filter.c:2340
+#: merge-recursive.c:2408
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: пропущена частица %%(end)"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
-#: ref-filter.c:2444
+#: merge-recursive.c:2929
#, c-format
-msgid "malformed object name %s"
-msgstr "непÑ\80авилÑ\8cное имÑ\8f обÑ\8aекÑ\82а %s"
+msgid "cannot read object %s"
+msgstr "невозможно пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»"
-#: remote.c:606
+#: merge-recursive.c:2932
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr "Ð\9dелÑ\8cзÑ\8f извлеÑ\87Ñ\8c одновÑ\80еменно %s и %s в %s"
+msgid "object %s is not a blob"
+msgstr "обÑ\8aекÑ\82 %s не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bм обÑ\8aекÑ\82ом"
-#: remote.c:610
-#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr "%s обычно отслеживает %s, а не %s"
+#: merge-recursive.c:2996
+msgid "modify"
+msgstr "изменение"
+
+#: merge-recursive.c:2996
+msgid "modified"
+msgstr "изменено"
+
+#: merge-recursive.c:3008
+msgid "content"
+msgstr "содержимое"
+
+#: merge-recursive.c:3012
+msgid "add/add"
+msgstr "добавление/добавление"
-#: remote.c:614
+#: merge-recursive.c:3035
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr "%s отслеживает и %s и %s"
+msgid "Skipped %s (merged same as existing)"
+msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-#: remote.c:622
-msgid "Internal error"
-msgstr "Ð\92нÑ\83Ñ\82Ñ\80еннÑ\8fÑ\8f оÑ\88ибка"
+#: merge-recursive.c:3057 git-submodule.sh:937
+msgid "submodule"
+msgstr "подмодÑ\83лÑ\8c"
-#: remote.c:1536 remote.c:1637
-msgid "HEAD does not point to a branch"
-msgstr "HEAD не указывает на ветку"
+#: merge-recursive.c:3058
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-#: remote.c:1545
+#: merge-recursive.c:3088
#, c-format
-msgid "no such branch: '%s'"
-msgstr "неÑ\82 Ñ\82акой веÑ\82ки: «%s»"
+msgid "Adding as %s instead"
+msgstr "Ð\94обавление вмеÑ\81Ñ\82о Ñ\8dÑ\82ого как %s"
-#: remote.c:1548
+#: merge-recursive.c:3170
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr "вышестоящая ветка не настроена для ветки «%s»"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
-#: remote.c:1554
+#: merge-recursive.c:3173
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed"
+" in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
-#: remote.c:1569
+#: merge-recursive.c:3177
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in"
+" %s; moving it to %s."
+msgstr ""
-#: remote.c:1581
+#: merge-recursive.c:3180
#, c-format
-msgid "branch '%s' has no remote for pushing"
-msgstr "ветка «%s» не имеет внешнего сервера для отправки"
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
-#: remote.c:1591
+#: merge-recursive.c:3294
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
-msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
+msgid "Removing %s"
+msgstr "Удаление %s"
-#: remote.c:1604
-msgid "push has no destination (push.default is 'nothing')"
-msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
+#: merge-recursive.c:3317
+msgid "file/directory"
+msgstr "файл/каталог"
-#: remote.c:1626
-msgid "cannot resolve 'simple' push to a single destination"
-msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c «simple» оÑ\82пÑ\80авкÑ\83 в единÑ\81Ñ\82веннÑ\83Ñ\8e Ñ\82оÑ\87кÑ\83 назнаÑ\87ениÑ\8f"
+#: merge-recursive.c:3322
+msgid "directory/file"
+msgstr "каÑ\82алог/Ñ\84айл"
-#: remote.c:1951
+#: merge-recursive.c:3329
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-
-#: remote.c:1955
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
+msgid ""
+"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
-#: remote.c:1958
+#: merge-recursive.c:3338
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
-msgstr "Ð\92аÑ\88а веÑ\82ка обновлена в Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вии Ñ\81 «%s».\n"
+msgid "Adding %s"
+msgstr "Ð\94обавление %s"
-#: remote.c:1962
+#: merge-recursive.c:3347
#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
-#: remote.c:1965
+#: merge-recursive.c:3385
#, c-format
-msgid " (use \"%s\" for details)\n"
-msgstr " (используйте «%s» для просмотра описания)\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-recursive.c:3396
+msgid "Already up to date!"
+msgstr "Уже обновлено!"
-#: remote.c:1969
+#: merge-recursive.c:3405
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n"
-msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n"
-msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
-msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
+msgid "merging of trees %s and %s failed"
+msgstr "сбой слияния деревьев «%s» и «%s»"
-#: remote.c:1975
-msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
+#: merge-recursive.c:3504
+msgid "Merging:"
+msgstr "Слияние:"
-#: remote.c:1978
+#: merge-recursive.c:3517
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Ваша ветка отстает от «%s» на %d коммит и может быть перемотана вперед.\n"
-msgstr[1] "Ваша ветка отстает от «%s» на %d коммита и может быть перемотана вперед.\n"
-msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "найден %u общий предок:"
+msgstr[1] "найдено %u общих предка:"
+msgstr[2] "найдено %u общих предков:"
+msgstr[3] "найдено %u общих предков:"
-#: remote.c:1986
-msgid " (use \"git pull\" to update your local branch)\n"
-msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
+#: merge-recursive.c:3556
+msgid "merge returned no commit"
+msgstr "слияние не вернуло коммит"
-#: remote.c:1989
+#: merge-recursive.c:3622
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разный коммит в каждой соответственно.\n"
-msgstr[1] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммита в каждой соответственно.\n"
-msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
+msgid "Could not parse object '%s'"
+msgstr "Не удалось разобрать объект «%s»"
-#: remote.c:1999
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+msgid "Unable to write index."
+msgstr "Не удается записать индекс."
-#: replace-object.c:20
+#: midx.c:66
#, c-format
-msgid "bad replace ref name: %s"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: replace-object.c:29
+#: midx.c:82
#, c-format
-msgid "duplicate replace ref: %s"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: replace-object.c:72
+#: midx.c:87
#, c-format
-msgid "replace depth too high for object %s"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: revision.c:2305
-msgid "your current branch appears to be broken"
-msgstr "похоже, ваша текущая ветка повреждена"
-
-#: revision.c:2308
+#: midx.c:92
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr "ваÑ\88а Ñ\82екÑ\83Ñ\89аÑ\8f веÑ\82ка «%s» еÑ\89е не Ñ\81одеÑ\80жиÑ\82 ни одного коммиÑ\82а"
+msgid "hash version %u does not match"
+msgstr "веÑ\80Ñ\81иÑ\8f Ñ\85еÑ\88-Ñ\81Ñ\83ммÑ\8b %u не Ñ\81ооÑ\82веÑ\82Ñ\81вÑ\83еÑ\82"
-#: revision.c:2505
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
+msgstr ""
-#: run-command.c:728
-msgid "open /dev/null failed"
-msgstr "сбой открытия /dev/null"
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
-#: run-command.c:1271
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»."
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
-#: send-pack.c:142
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
-#: send-pack.c:144
-#, c-format
-msgid "unable to parse remote unpack status: %s"
-msgstr "не удалось разобрать статус внешней распаковки: %s"
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
-#: send-pack.c:146
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:163
#, c-format
-msgid "remote unpack failed: %s"
-msgstr "сбой при внешней распаковке %s"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
-#: send-pack.c:309
-msgid "failed to sign the push certificate"
-msgstr "сбой подписания сертификата отправки"
+#: midx.c:208
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
-#: send-pack.c:422
-msgid "the receiving end does not support --signed push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
-#: send-pack.c:424
-msgid ""
-"not sending a push certificate since the receiving end does not support "
-"--signed push"
-msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
-#: send-pack.c:436
-msgid "the receiving end does not support --atomic push"
-msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
+#: midx.c:457
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
-#: send-pack.c:441
-msgid "the receiving end does not support push options"
-msgstr "принимающая сторона не поддерживает отправку с опциями"
+#: midx.c:463
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
-#: sequencer.c:177
+#: midx.c:557
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr "неправильный режим очистки сообщения коммита «%s»"
+msgid "failed to locate object %d in packfile"
+msgstr ""
-#: sequencer.c:278
+#: midx.c:993
#, c-format
-msgid "could not delete '%s'"
-msgstr "не удалось удалить «%s»"
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
-#: sequencer.c:304
-msgid "revert"
-msgstr "обратить изменения"
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
+msgstr ""
-#: sequencer.c:306
-msgid "cherry-pick"
-msgstr "копировать коммит"
+#: midx.c:1063
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
-#: sequencer.c:308
-msgid "rebase -i"
-msgstr "rebase -i"
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
+msgstr ""
-#: sequencer.c:310
+#: midx.c:1076
#, c-format
-msgid "unknown action: %d"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: sequencer.c:367
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
-msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
+#: midx.c:1095
+msgid "Sorting objects by packfile"
+msgstr ""
-#: sequencer.c:370
-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»"
+#: midx.c:1101
+msgid "Verifying object offsets"
+msgstr ""
-#: sequencer.c:383 sequencer.c:2488
+#: midx.c:1117
#, c-format
-msgid "could not lock '%s'"
-msgstr "не удалось заблокировать «%s»"
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
-#: sequencer.c:390
+#: midx.c:1123
#, c-format
-msgid "could not write eol to '%s'"
-msgstr "не удалось записать eol в «%s»"
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
-#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
-#: sequencer.c:2741
+#: midx.c:1132
#, c-format
-msgid "failed to finalize '%s'"
-msgstr "не удалось завершить «%s»"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
-#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
-#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
-#: builtin/merge.c:1081
+#: name-hash.c:531
#, c-format
-msgid "could not read '%s'"
-msgstr "не удалось прочитать «%s»"
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
-#: sequencer.c:444
+#: name-hash.c:553
#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr "ваши локальные изменения будут перезаписаны %s."
-
-#: sequencer.c:448
-msgid "commit your changes or stash them to proceed."
-msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
-#: sequencer.c:477
+#: name-hash.c:559
#, c-format
-msgid "%s: fast-forward"
-msgstr "%s: перемотка вперед"
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#: sequencer.c:566
+#: notes-merge.c:277
#, c-format
-msgid "%s: Unable to write new index file"
-msgstr "%s: Не удалось записать файл индекса"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
+msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
-#: sequencer.c:582
-msgid "unable to update cache tree"
-msgstr "не удалось обновить дерево кэша"
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
-#: sequencer.c:595
-msgid "could not resolve HEAD commit"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80аÑ\81познаÑ\82Ñ\8c HEAD коммиÑ\82"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Ð\9dелÑ\8cзÑ\8f закоммиÑ\82иÑ\82Ñ\8c неиниÑ\86иализиÑ\80ованное или не имеÑ\8eÑ\89ее Ñ\81Ñ\81Ñ\8bлок деÑ\80ево замеÑ\82ок"
-#: sequencer.c:723
+#: notes-utils.c:105
#, c-format
-msgid "could not parse '%s' (looking for '%s'"
-msgstr ""
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Неправильное значение notes.rewriteMode: «%s»"
-#: sequencer.c:731
+#: notes-utils.c:115
#, c-format
-msgid "bad quoting on %s value in '%s'"
-msgstr ""
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
-#: sequencer.c:740
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#: notes-utils.c:145
#, c-format
-msgid "could not parse '%s' (looking for '%s')"
-msgstr ""
+msgid "Bad %s value: '%s'"
+msgstr "Неправильное значение переменной %s: «%s»"
-#: sequencer.c:747
+#: object.c:54
#, c-format
-msgid "invalid date format '%s' in '%s'"
+msgid "invalid object type \"%s\""
msgstr ""
-#: sequencer.c:761
+#: object.c:174
#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
-
-#: sequencer.c:830
-msgid "writing root commit"
-msgstr "запись коневого коммита"
-
-#: sequencer.c:1055
-msgid "'prepare-commit-msg' hook failed"
-msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
-
-#: sequencer.c:1062
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-
-#: sequencer.c:1075
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
-msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-
-#: sequencer.c:1115
-msgid "couldn't look up newly created commit"
-msgstr "нельзя запросить новосозданный коммит"
-
-#: sequencer.c:1117
-msgid "could not parse newly created commit"
-msgstr "нельзя разобрать новосозданный коммит"
+msgid "object %s is a %s, not a %s"
+msgstr ""
-#: sequencer.c:1163
-msgid "unable to resolve HEAD after creating commit"
-msgstr "не удалось найти HEAD после создания коммита"
+#: object.c:234
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
-#: sequencer.c:1165
-msgid "detached HEAD"
-msgstr "отделённый HEAD"
+#: object.c:247
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "не удалось разобрать объект: %s"
-#: sequencer.c:1169
-msgid " (root-commit)"
-msgstr " (корневой коммит)"
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "несоответствие хеш-суммы %s"
-#: sequencer.c:1190
-msgid "could not parse HEAD"
-msgstr "не удалось разобрать HEAD"
+#: packfile.c:617
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-#: sequencer.c:1192
+#: packfile.c:1868
#, c-format
-msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s не является коммитом!"
-
-#: sequencer.c:1196 builtin/commit.c:1528
-msgid "could not parse HEAD commit"
-msgstr "не удалось разобрать HEAD коммит"
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-#: sequencer.c:1247 sequencer.c:1845
-msgid "unable to parse commit author"
-msgstr "не удалось разобрать автора коммита"
+#: packfile.c:1872
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
-#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree не удалось записать дерево"
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr ""
-#: sequencer.c:1274 sequencer.c:1329
+#: parse-options.c:73
#, c-format
-msgid "unable to read commit message from '%s'"
-msgstr "не удалось прочитать сообщение коммита из «%s»"
+msgid "%s is incompatible with %s"
+msgstr ""
-#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631
-#: builtin/merge.c:855 builtin/merge.c:880
-msgid "failed to write commit object"
-msgstr "сбой записи объекта коммита"
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
-#: sequencer.c:1356
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
-msgid "could not parse commit %s"
-msgstr "не удалось разобрать коммит %s"
+msgid "%s takes no value"
+msgstr ""
-#: sequencer.c:1361
+#: parse-options.c:94
#, c-format
-msgid "could not parse parent commit %s"
-msgstr "не удалось разобрать родительский коммит %s"
+msgid "%s isn't available"
+msgstr ""
-#: sequencer.c:1457 sequencer.c:1565
+#: parse-options.c:219
#, c-format
-msgid "unknown command: %d"
-msgstr "неизвестная команда: %d"
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
-#: sequencer.c:1512 sequencer.c:1537
+#: parse-options.c:389
#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Это объединение %d коммитов."
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
-#: sequencer.c:1522 sequencer.c:4520
-msgid "need a HEAD to fixup"
-msgstr "нужен HEAD для исправления"
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr ""
-#: sequencer.c:1524 sequencer.c:2768
-msgid "could not read HEAD"
-msgstr "не удалось прочитать HEAD"
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
-#: sequencer.c:1526
-msgid "could not read HEAD's commit message"
-msgstr "не удалось прочитать сообщение коммита текущего HEAD"
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
-#: sequencer.c:1532
+#: parse-options.c:863
#, c-format
-msgid "cannot write '%s'"
-msgstr "не удалось записать «%s»"
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
-#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
-msgid "This is the 1st commit message:"
-msgstr "Это 1-е сообщение коммита:"
+#: parse-options.c:887
+msgid "..."
+msgstr "…"
-#: sequencer.c:1547
+#: parse-options.c:906
#, c-format
-msgid "could not read commit message of %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\81ообÑ\89ение коммиÑ\82а длÑ\8f %s"
+msgid "usage: %s"
+msgstr "иÑ\81полÑ\8cзование: %s"
-#: sequencer.c:1554
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#: parse-options.c:912
#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Это сообщение коммита номер #%d:"
+msgid " or: %s"
+msgstr " или: %s"
-#: sequencer.c:1560
+#: parse-options.c:915
#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Сообщение коммита номер #%d будет пропущено:"
-
-#: sequencer.c:1643
-msgid "your index file is unmerged."
-msgstr "ваш индекс не слит."
+msgid " %s"
+msgstr " %s"
-#: sequencer.c:1650
-msgid "cannot fixup root commit"
-msgstr "нельзя исправить корневой коммит"
+#: parse-options.c:954
+msgid "-NUM"
+msgstr "-КОЛИЧЕСТВО"
-#: sequencer.c:1669
+#: parse-options.c:968
#, c-format
-msgid "commit %s is a merge but no -m option was given."
-msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
+msgid "alias of --%s"
+msgstr ""
-#: sequencer.c:1677
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "commit %s does not have parent %d"
-msgstr "у коммита %s нет предка %d"
+msgid "option `%s' expects a numerical value"
+msgstr ""
-#: sequencer.c:1681
+#: parse-options-cb.c:41
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
-msgstr "основная ветка указана, но коммит %s не является слиянием."
+msgid "malformed expiration date '%s'"
+msgstr ""
-#: sequencer.c:1687
+#: parse-options-cb.c:54
#, c-format
-msgid "cannot get commit message for %s"
-msgstr "не удалось получить сообщение коммита для %s"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1706
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
-msgid "%s: cannot parse parent commit %s"
-msgstr "%s: не удалось разобрать родительский коммит для %s"
+msgid "malformed object name '%s'"
+msgstr "Неправильное имя объекта «%s»"
-#: sequencer.c:1771
+#: path.c:897
#, c-format
-msgid "could not rename '%s' to '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пеÑ\80еименоваÑ\82Ñ\8c «%s» в «%s»"
+msgid "Could not make %s writable by group"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80едоÑ\81Ñ\82авиÑ\82Ñ\8c доÑ\81Ñ\82Ñ\83п к %s на запиÑ\81Ñ\8c"
-#: sequencer.c:1826
-#, c-format
-msgid "could not revert %s... %s"
-msgstr "не удалось обратить изменения коммита %s… %s"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
-#: sequencer.c:1827
-#, c-format
-msgid "could not apply %s... %s"
-msgstr "не удалось применить коммит %s… %s"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Разрешен только один спецификатор «attr:»."
-#: sequencer.c:1885
+#: pathspec.c:149
+msgid "attr spec must not be empty"
+msgstr "спецификатор attr не должен быть пустой"
+
+#: pathspec.c:192
#, c-format
-msgid "git %s: failed to read the index"
-msgstr "git %s: сбой чтения индекса"
+msgid "invalid attribute name %s"
+msgstr "недопустимое имя атрибута %s"
+
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать одновременно"
+
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
+
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути "
-#: sequencer.c:1892
+#: pathspec.c:325
#, c-format
-msgid "git %s: failed to refresh the index"
-msgstr "git %s: сбой обновления индекса"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
-#: sequencer.c:1972
+#: pathspec.c:330
#, c-format
-msgid "%s does not accept arguments: '%s'"
-msgstr "паÑ\80амеÑ\82Ñ\80 %s не пÑ\80инимаеÑ\82 аÑ\80гÑ\83менÑ\82Ñ\8b: «%s»"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Ð\9fÑ\80опÑ\83Ñ\89ено «)» в конÑ\86е магиÑ\87еÑ\81кого Ñ\81лова Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80а пÑ\83Ñ\82и «%s»"
-#: sequencer.c:1981
+#: pathspec.c:368
#, c-format
-msgid "missing arguments for %s"
-msgstr "пÑ\80опÑ\83Ñ\89енÑ\8b аÑ\80гÑ\83менÑ\82Ñ\8b длÑ\8f %s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Ð\9dеÑ\80еализованное магиÑ\87еÑ\81кое Ñ\81лово «%c» Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80а пÑ\83Ñ\82и «%s»"
-#: sequencer.c:2040
+#: pathspec.c:427
#, c-format
-msgid "invalid line %d: %.*s"
-msgstr "неправильная строка %d: %.*s"
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: «literal» и «glob» не совместимы"
-#: sequencer.c:2048
+#: pathspec.c:440
#, c-format
-msgid "cannot '%s' without a previous commit"
-msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
+msgid "%s: '%s' is outside repository"
+msgstr "%s: «%s» вне репозитория"
-#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
+#: pathspec.c:514
#, c-format
-msgid "could not read '%s'."
-msgstr "не удалось прочитать «%s»."
+msgid "'%s' (mnemonic: '%c')"
+msgstr "«%s» (мнемоника: «%c»)"
-#: sequencer.c:2119
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
+#: pathspec.c:524
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
-#: sequencer.c:2121
+#: pathspec.c:591
#, c-format
-msgid "unusable instruction sheet: '%s'"
-msgstr "непригодная для использования карта с инструкциями: «%s»"
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "спецификатор пути «%s» находится за символической ссылкой"
-#: sequencer.c:2126
-msgid "no commits parsed."
-msgstr "коммиты не разобраны."
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr ""
-#: sequencer.c:2137
-msgid "cannot cherry-pick during a revert."
-msgstr "нельзя скопировать коммит во время процесса обращения коммита."
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr ""
-#: sequencer.c:2139
-msgid "cannot revert during a cherry-pick."
-msgstr "нельзя обратить изменения коммита во время копирования коммита."
+#: pkt-line.c:106
+msgid "flush packet write failed"
+msgstr ""
-#: sequencer.c:2209
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "неправильное значение %s: %s"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
+msgstr ""
-#: sequencer.c:2285
-msgid "unusable squash-onto"
-msgstr "непригодный для использования уплотнить-над"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
+msgstr ""
-#: sequencer.c:2301
-#, c-format
-msgid "malformed options sheet: '%s'"
-msgstr "испорченная карта с опциями: «%s»"
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
-#: sequencer.c:2335 sequencer.c:3775
-msgid "empty commit set passed"
-msgstr "передан пустой набор коммитов"
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr ""
-#: sequencer.c:2343
-msgid "a cherry-pick or revert is already in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
+#: pkt-line.c:295
+msgid "read error"
+msgstr ""
-#: sequencer.c:2344
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr ""
-#: sequencer.c:2347
+#: pkt-line.c:331
#, c-format
-msgid "could not create sequencer directory '%s'"
-msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-
-#: sequencer.c:2361
-msgid "could not lock HEAD"
-msgstr "не удалось заблокировать HEAD"
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
-#: sequencer.c:2416 sequencer.c:3543
-msgid "no cherry-pick or revert in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
-#: sequencer.c:2418
-msgid "cannot resolve HEAD"
-msgstr "не удалось определить HEAD"
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
+msgstr "ошибка внешнего репозитория: %s"
-#: sequencer.c:2420 sequencer.c:2455
-msgid "cannot abort from a branch yet to be born"
-msgstr "нельзя отменить изменения с ветки, которая еще не создана"
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr ""
-#: sequencer.c:2441 builtin/grep.c:721
+#: preload-index.c:138
#, c-format
-msgid "cannot open '%s'"
-msgstr "не удалось открыть «%s»"
+msgid "unable to create threaded lstat: %s"
+msgstr ""
-#: sequencer.c:2443
-#, c-format
-msgid "cannot read '%s': %s"
-msgstr "не удалось прочитать «%s»: %s"
+#: pretty.c:966
+msgid "unable to parse --pretty format"
+msgstr "не удалось разобрать формат для --pretty"
-#: sequencer.c:2444
-msgid "unexpected end of file"
-msgstr "неожиданный конец файла"
+#: range-diff.c:56
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:59
+msgid "could not read `log` output"
+msgstr ""
-#: sequencer.c:2450
+#: range-diff.c:74 sequencer.c:4897
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
+msgid "could not parse commit '%s'"
+msgstr "не удалось разобрать коммит «%s»"
-#: sequencer.c:2461
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
+#: range-diff.c:224
+msgid "failed to generate diff"
+msgstr ""
-#: sequencer.c:2565 sequencer.c:3461
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "could not update %s"
-msgstr "не удалось обновить %s"
+msgid "could not parse log for '%s'"
+msgstr ""
-#: sequencer.c:2603 sequencer.c:3441
-msgid "cannot read HEAD"
-msgstr "не удалось прочитать HEAD"
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
+msgstr ""
-#: sequencer.c:2618
+#: read-cache.c:718
#, c-format
-msgid "unable to copy '%s' to '%s'"
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: sequencer.c:2626
+#: read-cache.c:723
#, c-format
-msgid ""
-"You can amend the commit now, with\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-" git rebase --continue\n"
+msgid "'%s' does not have a commit checked out"
msgstr ""
-#: sequencer.c:2636
+#: read-cache.c:775
#, c-format
-msgid "Could not apply %s... %.*s"
+msgid "unable to index file '%s'"
msgstr ""
-#: sequencer.c:2643
+#: read-cache.c:794
#, c-format
-msgid "Could not merge %.*s"
+msgid "unable to add '%s' to index"
msgstr ""
-#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
+#: read-cache.c:805
#, c-format
-msgid "could not copy '%s' to '%s'"
-msgstr "не удалось скопировать «%s» в «%s»"
+msgid "unable to stat '%s'"
+msgstr ""
-#: sequencer.c:2680 sequencer.c:3095
-msgid "could not read index"
-msgstr "не удалось прочитать индекс"
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1499
+msgid "Refresh index"
+msgstr ""
-#: sequencer.c:2685
+#: read-cache.c:1613
#, c-format
msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n"
-
-#: sequencer.c:2691
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
-#: sequencer.c:2697
+#: read-cache.c:1623
#, c-format
msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
-msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-#: sequencer.c:2758
+#: read-cache.c:1679
#, c-format
-msgid "illegal label name: '%.*s'"
+msgid "bad signature 0x%08x"
msgstr ""
-#: sequencer.c:2810
-msgid "writing fake root commit"
-msgstr "запись поддельного корневого коммита"
-
-#: sequencer.c:2815
-msgid "writing squash-onto"
-msgstr "запить уплотнить-над"
-
-#: sequencer.c:2850
+#: read-cache.c:1682
#, c-format
-msgid "failed to find tree of %s"
-msgstr "не удалось найти дерево для %s"
+msgid "bad index version %d"
+msgstr ""
-#: sequencer.c:2868
-msgid "could not write index"
-msgstr "не удалось записать индекс"
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
+msgstr ""
-#: sequencer.c:2895
+#: read-cache.c:1721
#, c-format
-msgid "could not resolve '%s'"
-msgstr "не удалось распознать «%s»"
-
-#: sequencer.c:2921
-msgid "cannot merge without a current revision"
-msgstr "нельзя слить без текущей редакции"
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
-#: sequencer.c:2943
+#: read-cache.c:1723
#, c-format
-msgid "unable to parse '%.*s'"
+msgid "ignoring %.4s extension"
msgstr ""
-#: sequencer.c:2952
+#: read-cache.c:1760
#, c-format
-msgid "nothing to merge: '%.*s'"
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: sequencer.c:2964
-msgid "octopus merge cannot be executed on top of a [new root]"
+#: read-cache.c:1776
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: sequencer.c:2979
-#, c-format
-msgid "could not get commit message of '%s'"
-msgstr "не удалось получить сообщение коммита для «%s»"
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
+msgstr ""
-#: sequencer.c:2989 sequencer.c:3015
+#: read-cache.c:1836
#, c-format
-msgid "could not write '%s'"
-msgstr "не удалось записать «%s»"
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
-#: sequencer.c:3127
+#: read-cache.c:1839
#, c-format
-msgid "could not even attempt to merge '%.*s'"
-msgstr "не удалось даже попытаться слить «%.*s»"
+msgid "unordered stage entries for '%s'"
+msgstr ""
-#: sequencer.c:3143
-msgid "merge: Unable to write new index file"
-msgstr "слияние: Не удалось записать файл индекса"
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
+#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
+msgstr "файл индекса поврежден"
-#: sequencer.c:3211
+#: read-cache.c:2087
#, c-format
-msgid "Applied autostash.\n"
-msgstr "Применены автоматически спрятанные изменения.\n"
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
-#: sequencer.c:3223
+#: read-cache.c:2100
#, c-format
-msgid "cannot store %s"
-msgstr "не удалось сохранить %s"
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
-#: sequencer.c:3226 git-rebase.sh:188
+#: read-cache.c:2133
#, 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"
+msgid "%s: index file open failed"
+msgstr ""
-#: sequencer.c:3257
+#: read-cache.c:2137
#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-" %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-" git rebase --edit-todo\n"
-" git rebase --continue\n"
+msgid "%s: cannot stat the open index"
msgstr ""
-#: sequencer.c:3325
+#: read-cache.c:2141
#, c-format
-msgid "Stopped at %s... %.*s\n"
-msgstr "Остановлено на %s … %.*s\n"
+msgid "%s: index file smaller than expected"
+msgstr ""
-#: sequencer.c:3404
+#: read-cache.c:2145
#, c-format
-msgid "unknown command %d"
-msgstr "неизвестная команда %d"
-
-#: sequencer.c:3449
-msgid "could not read orig-head"
-msgstr "не удалось прочитать orig-head"
-
-#: sequencer.c:3454 sequencer.c:4517
-msgid "could not read 'onto'"
-msgstr "не удалось прочитать «onto»"
+msgid "%s: unable to map index file"
+msgstr ""
-#: sequencer.c:3468
+#: read-cache.c:2187
#, c-format
-msgid "could not update HEAD to %s"
-msgstr "не удалось обновить HEAD на %s"
-
-#: sequencer.c:3554
-msgid "cannot rebase: You have unstaged changes."
-msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-
-#: sequencer.c:3563
-msgid "cannot amend non-existing commit"
-msgstr "не удалось исправить несуществующий коммит"
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
-#: sequencer.c:3565
+#: read-cache.c:2214
#, c-format
-msgid "invalid file: '%s'"
-msgstr "недопустимый файл: «%s»"
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
-#: sequencer.c:3567
+#: read-cache.c:2246
#, c-format
-msgid "invalid contents: '%s'"
-msgstr "недопустимое содержимое: «%s»"
-
-#: sequencer.c:3570
-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» снова."
+msgid "could not freshen shared index '%s'"
+msgstr ""
-#: sequencer.c:3595 sequencer.c:3633
+#: read-cache.c:2293
#, c-format
-msgid "could not write file: '%s'"
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: sequencer.c:3648
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "не удалось удалить CHERRY_PICK_HEAD"
-
-#: sequencer.c:3655
-msgid "could not commit staged changes."
-msgstr "не удалось закоммитить проиндексированные изменения."
-
-#: sequencer.c:3752
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
#, c-format
-msgid "%s: can't cherry-pick a %s"
-msgstr "%s: не удалось скопировать коммит %s"
+msgid "could not close '%s'"
+msgstr "не удалось закрыть «%s»"
-#: sequencer.c:3756
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
#, c-format
-msgid "%s: bad revision"
-msgstr "%s: плохая редакция"
+msgid "could not stat '%s'"
+msgstr "не удалось выполнить stat для «%s»"
-#: sequencer.c:3791
-msgid "can't revert as initial commit"
-msgstr "нельзя возвратить изначальный коммит"
+#: read-cache.c:3105
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "не удалось открыть каталог git: %s"
-#: sequencer.c:4238
-msgid "make_script: unhandled options"
-msgstr "make_script: не обработанные опции"
+#: read-cache.c:3117
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "не удалось отсоединить: %s"
-#: sequencer.c:4241
-msgid "make_script: error preparing revisions"
-msgstr "make_script: ошибка при обновлении редакций"
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
-#: sequencer.c:4281 sequencer.c:4337
+#: read-cache.c:3291
#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "непригодный для использования список дел: «%s»"
+msgid "%s: cannot drop to stage #0"
+msgstr ""
-#: sequencer.c:4396
+#: rebase-interactive.c:26
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
-#: sequencer.c:4466
-#, c-format
+#: rebase-interactive.c:35
msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
-msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nb, break = остановиться здесь (продолжить с помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
-#: sequencer.c:4473
+#: rebase-interactive.c:56
#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
-msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
-#: sequencer.c:4486
-#, c-format
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n"
-
-#: sequencer.c:4660
-msgid "the script was already rearranged."
-msgstr "сценарий уже был перестроен."
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
-#: setup.c:123
-#, c-format
-msgid "'%s' is outside repository"
-msgstr "«%s» вне репозитория"
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
-#: setup.c:172
-#, c-format
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
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 <команда> -- <путь>…» для указания путей, которые не существуют локально."
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
+
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr "Заметьте, что пустые коммиты закомментированны"
-#: setup.c:185
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
+#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
+msgid "could not write '%s'"
+msgstr "не удалось записать «%s»"
-#: setup.c:234
+#: rebase-interactive.c:108
#, c-format
-msgid "option '%s' must come before non-option arguments"
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: setup.c:253
+#: rebase-interactive.c:173
#, c-format
msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
-#: setup.c:389
-msgid "unable to set up work tree using invalid config"
-msgstr ""
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr "Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
-#: setup.c:393
-msgid "this operation must be run in a work tree"
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
msgstr ""
-#: setup.c:503
+#: refs.c:597
#, c-format
-msgid "Expected git repo version <= %d, found %d"
-msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-
-#: setup.c:511
-msgid "unknown repository extensions found:"
-msgstr "обнаружены неизвестные расширения репозитория:"
+msgid "ignoring dangling symref %s"
+msgstr ""
-#: setup.c:530
+#: refs.c:599 ref-filter.c:1982
#, c-format
-msgid "error opening '%s'"
-msgstr "оÑ\88ибка оÑ\82кÑ\80Ñ\8bÑ\82иÑ\8f «%s»"
+msgid "ignoring broken ref %s"
+msgstr "игноÑ\80иÑ\80Ñ\83Ñ\8e непÑ\80авилÑ\8cнÑ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 %s"
-#: setup.c:532
+#: refs.c:734
#, c-format
-msgid "too large to be a .git file: '%s'"
-msgstr "файл слишком большой как для .git файла: «%s»"
+msgid "could not open '%s' for writing: %s"
+msgstr "не удалось открыть «%s» для записи: %s"
-#: setup.c:534
+#: refs.c:744 refs.c:795
#, c-format
-msgid "error reading %s"
-msgstr "ошибка чтения %s"
+msgid "could not read ref '%s'"
+msgstr ""
-#: setup.c:536
+#: refs.c:750
#, c-format
-msgid "invalid gitfile format: %s"
-msgstr "неправильный формат файла gitfile: %s"
+msgid "ref '%s' already exists"
+msgstr ""
-#: setup.c:538
+#: refs.c:755
#, c-format
-msgid "no path in gitfile: %s"
-msgstr "нет пути в gitfile: %s"
+msgid "unexpected object ID when writing '%s'"
+msgstr ""
-#: setup.c:540
+#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
+#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
#, c-format
-msgid "not a git repository: %s"
-msgstr "не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ием git: %s"
+msgid "could not write to '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c в «%s»"
-#: setup.c:639
+#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:993
#, c-format
-msgid "'$%s' too big"
-msgstr "«$%s» слишком большой"
+msgid "could not open '%s' for writing"
+msgstr "не удалось открыть «%s» для записи"
-#: setup.c:653
+#: refs.c:797
#, c-format
-msgid "not a git repository: '%s'"
-msgstr "не является репозиторием git: «%s»"
+msgid "unexpected object ID when deleting '%s'"
+msgstr ""
-#: setup.c:682 setup.c:684 setup.c:715
+#: refs.c:928
#, c-format
-msgid "cannot chdir to '%s'"
-msgstr "не удалось выполнить chdir в «%s»"
-
-#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
-msgid "cannot come back to cwd"
-msgstr "не удалось вернуться в cwd"
+msgid "log for ref %s has gap after %s"
+msgstr ""
-#: setup.c:813
+#: refs.c:934
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
-#: setup.c:824
+#: refs.c:993
#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "не удалось выполнить stat для «%*s%s%s»"
-
-#: setup.c:1054
-msgid "Unable to read current working directory"
-msgstr "Не удалось прочитать текущий рабочий каталог"
+msgid "log for %s is empty"
+msgstr ""
-#: setup.c:1066 setup.c:1072
+#: refs.c:1085
#, c-format
-msgid "cannot change to '%s'"
-msgstr "не удалось изменить на «%s»"
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
-#: setup.c:1085
+#: refs.c:1161
#, 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 не установлен)."
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
-#: setup.c:1168
+#: refs.c:1942
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: setup.c:1211
-msgid "open /dev/null or dup failed"
-msgstr "сбой открытия /dev/null или дублирования дескриптора"
-
-#: setup.c:1226
-msgid "fork failed"
-msgstr "сбой при выполнении fork"
-
-#: setup.c:1231
-msgid "setsid failed"
-msgstr "сбой при выполнении setsid"
+#: refs.c:1974
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновление ссылок запрещено в изолированном окружении"
-#: sha1-file.c:381
+#: refs.c:2070 refs.c:2100
#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: sha1-file.c:432
+#: refs.c:2076 refs.c:2111
#, c-format
-msgid "unable to normalize alternate object path: %s"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: sha1-file.c:503
+#: refs/files-backend.c:1234
#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
+msgid "could not remove reference %s"
+msgstr "не удалось удалить ссылки %s"
-#: sha1-file.c:510
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
+msgid "could not delete reference %s: %s"
+msgstr "не удалось удалить ссылку %s: %s"
-#: sha1-file.c:565
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
+msgstr "не удалось удалить ссылки: %s"
-#: sha1-file.c:583
-msgid "unable to read alternates file"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: sha1-file.c:590
-msgid "unable to move new alternates file into place"
-msgstr ""
+#: ref-filter.c:39 wt-status.c:1909
+msgid "gone"
+msgstr "исчез"
-#: sha1-file.c:625
+#: ref-filter.c:40
#, c-format
-msgid "path '%s' does not exist"
-msgstr "пÑ\83Ñ\82Ñ\8c «%s» не Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
+msgid "ahead %d"
+msgstr "впеÑ\80еди %d"
-#: sha1-file.c:651
+#: ref-filter.c:41
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
+msgid "behind %d"
+msgstr "позади %d"
-#: sha1-file.c:657
+#: ref-filter.c:42
#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "ссылаемый репозиторий «%s» не является локальным."
+msgid "ahead %d, behind %d"
+msgstr "впереди %d, позади %d"
-#: sha1-file.c:663
+#: ref-filter.c:138
#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "ссылаемый репозиторий «%s» является частичным"
+msgid "expected format: %%(color:<color>)"
+msgstr "ожидаемый формат: %%(color:<color>)"
-#: sha1-file.c:671
+#: ref-filter.c:140
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "ссылаемый репозиторий «%s» является сращенным"
+msgid "unrecognized color: %%(color:%s)"
+msgstr "неопознанный цвет: %%(color:%s)"
-#: sha1-file.c:781
+#: ref-filter.c:162
#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Ожидается целочисленное значение refname:lstrip=%s"
-#: sha1-file.c:806
-msgid "mmap failed"
-msgstr ""
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Ожидается целочисленное значение refname:rstrip=%s"
-#: sha1-file.c:973
+#: ref-filter.c:168
#, c-format
-msgid "object file %s is empty"
-msgstr ""
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "неопознанный аргумент %%(%s): %s"
-#: sha1-file.c:1093 sha1-file.c:2206
+#: ref-filter.c:223
#, c-format
-msgid "corrupt loose object '%s'"
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: sha1-file.c:1095 sha1-file.c:2210
+#: ref-filter.c:245
#, c-format
-msgid "garbage at end of loose object '%s'"
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: sha1-file.c:1137
-msgid "invalid object type"
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: sha1-file.c:1219
+#: ref-filter.c:265
#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
+msgid "%%(body) does not take arguments"
+msgstr "параметр %%(body) не принимает аргументы"
-#: sha1-file.c:1222
+#: ref-filter.c:274
#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
+msgid "%%(subject) does not take arguments"
+msgstr "параметр %%(subject) не принимает аргументы"
-#: sha1-file.c:1228
+#: ref-filter.c:296
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
+msgid "unknown %%(trailers) argument: %s"
+msgstr "неизвестный аргумент для %%(trailers): %s"
-#: sha1-file.c:1231
+#: ref-filter.c:325
#, c-format
-msgid "unable to parse %s header"
-msgstr ""
+msgid "positive value expected contents:lines=%s"
+msgstr "положительное значение ожидает contents:lines=%s"
-#: sha1-file.c:1422
+#: ref-filter.c:327
#, c-format
-msgid "failed to read object %s"
-msgstr ""
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "неопознанный аргумент %%(contents): %s"
-#: sha1-file.c:1426
+#: ref-filter.c:342
#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
+msgid "positive value expected objectname:short=%s"
+msgstr "ожидается положительное значение objectname:short=%s"
-#: sha1-file.c:1430
+#: ref-filter.c:346
#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "неопознанный аргумент %%(objectname): %s"
-#: sha1-file.c:1434
+#: ref-filter.c:376
#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-#: sha1-file.c:1536
+#: ref-filter.c:388
#, c-format
-msgid "unable to write sha1 filename %s"
-msgstr ""
+msgid "unrecognized position:%s"
+msgstr "неопознанная позиция:%s"
-#: sha1-file.c:1543
+#: ref-filter.c:395
#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
+msgid "unrecognized width:%s"
+msgstr "неопознанная ширина:%s"
-#: sha1-file.c:1550
-msgid "file write error"
-msgstr ""
-
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr ""
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "неопознанный аргумент %%(align): %s"
-#: sha1-file.c:1635
+#: ref-filter.c:412
#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
+msgid "positive width expected with the %%(align) atom"
+msgstr "ожидается положительная ширина с указанием частицы %%(align)"
-#: sha1-file.c:1637
-msgid "unable to create temporary file"
-msgstr ""
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "неопознанный аргумент %%(if): %s"
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr ""
+#: ref-filter.c:531
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "неправильное имя поля: %.*s"
-#: sha1-file.c:1667
+#: ref-filter.c:558
#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
+msgid "unknown field name: %.*s"
+msgstr "неизвестное имя поля: %.*s"
-#: sha1-file.c:1671
+#: ref-filter.c:562
#, c-format
-msgid "deflateEnd on object %s failed (%d)"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: sha1-file.c:1675
+#: ref-filter.c:686
#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "формат: частица %%(if) использована без частицы %%(then)"
-#: sha1-file.c:1685 builtin/pack-objects.c:899
+#: ref-filter.c:749
#, c-format
-msgid "failed utime() on %s"
-msgstr ""
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "формат: частица %%(then) использована без частицы %%(if)"
-#: sha1-file.c:1760
+#: ref-filter.c:751
#, c-format
-msgid "cannot read sha1_file for %s"
-msgstr ""
+msgid "format: %%(then) atom used more than once"
+msgstr "формат: частица %%(then) использована более одного раза"
-#: sha1-file.c:1805
-msgid "corrupt commit"
-msgstr ""
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "формат: частица %%(then) использована после %%(else)"
-#: sha1-file.c:1813
-msgid "corrupt tag"
-msgstr ""
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "формат: частица %%(else) использована без частицы %%(if)"
-#: sha1-file.c:1906
+#: ref-filter.c:783
#, c-format
-msgid "read error while indexing %s"
-msgstr ""
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "формат: частица %%(else) использована без частицы %%(then)"
-#: sha1-file.c:1909
+#: ref-filter.c:785
#, c-format
-msgid "short read while indexing %s"
-msgstr ""
+msgid "format: %%(else) atom used more than once"
+msgstr "формат: частица %%(else) использована более одного раза"
-#: sha1-file.c:1980 sha1-file.c:1989
+#: ref-filter.c:800
#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "формат: частица %%(end) использована без соответствующей частицы"
-#: sha1-file.c:1995
+#: ref-filter.c:857
#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
+msgid "malformed format string %s"
+msgstr "неправильная строка формата %s"
-#: sha1-file.c:2019
+#: ref-filter.c:1453
#, c-format
-msgid "%s is not a valid object"
-msgstr ""
+msgid "(no branch, rebasing %s)"
+msgstr "(нет ветки, перемещение %s)"
-#: sha1-file.c:2021
+#: ref-filter.c:1456
#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s не является действительным объектом «%s»"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(нет ветки перемещение отделённого HEAD %s)"
-#: sha1-file.c:2048 builtin/index-pack.c:158
+#: ref-filter.c:1459
#, c-format
-msgid "unable to open %s"
-msgstr "не удалось открыть %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(нет ветки, двоичный поиск начат на %s)"
-#: sha1-file.c:2217 sha1-file.c:2269
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#: ref-filter.c:1467
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
-msgstr ""
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD отделён на %s)"
-#: sha1-file.c:2241
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#: ref-filter.c:1474
#, c-format
-msgid "unable to mmap %s"
-msgstr ""
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD отделён начиная с %s)"
-#: sha1-file.c:2246
+#: ref-filter.c:1478
+msgid "(no branch)"
+msgstr "(нет ветки)"
+
+#: ref-filter.c:1512 ref-filter.c:1669
#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
+msgid "missing object %s for %s"
+msgstr "не найден объект %s для %s"
-#: sha1-file.c:2252
+#: ref-filter.c:1522
#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-#: sha1-file.c:2263
+#: ref-filter.c:1888
#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
+msgid "malformed object at '%s'"
+msgstr "Повреждённый объект «%s»"
-#: sha1-name.c:444
+#: ref-filter.c:1977
#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
+msgid "ignoring ref with broken name %s"
+msgstr "игнорирую ссылку с неправильным именем %s"
-#: sha1-name.c:455
-msgid "The candidates are:"
-msgstr "Возможно, вы имели в виду:"
+#: ref-filter.c:2263
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: пропущена частица %%(end)"
-#: sha1-name.c:699
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
+#: ref-filter.c:2363
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr ""
-#: submodule.c:97 submodule.c:131
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
+#: ref-filter.c:2366
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr ""
-#: submodule.c:101 submodule.c:135
+#: ref-filter.c:2376
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и Ñ\80аздел в .gitmodules, где пÑ\83Ñ\82Ñ\8c Ñ\80авен %s"
+msgid "malformed object name %s"
+msgstr "непÑ\80авилÑ\8cное имÑ\8f обÑ\8aекÑ\82а %s"
-#: submodule.c:109
+#: ref-filter.c:2381
#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr " Не удалось обновить .gitmodules запись %s"
+msgid "option `%s' must point to a commit"
+msgstr ""
-#: submodule.c:142
+#: remote.c:363
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr "Не удалось удалить запись в .gitmodules для %s"
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
-#: submodule.c:153
-msgid "staging updated .gitmodules failed"
-msgstr "сбой индексирования обновленного .gitmodules"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr ""
-#: submodule.c:315
-#, c-format
-msgid "in unpopulated submodule '%s'"
-msgstr "в пустом подмодуле «%s»"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr ""
-#: submodule.c:346
+#: remote.c:608
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "СпеÑ\86иÑ\84икаÑ\82оÑ\80 пÑ\83Ñ\82и «%s» в подмодÑ\83ле «%.*s»"
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Ð\9dелÑ\8cзÑ\8f извлеÑ\87Ñ\8c одновÑ\80еменно %s и %s в %s"
-#: submodule.c:839
+#: remote.c:612
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
-
-#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Не удалось определить HEAD как действительную ссылку."
+msgid "%s usually tracks %s, not %s"
+msgstr "%s обычно отслеживает %s, а не %s"
-#: submodule.c:1377
+#: remote.c:616
#, c-format
-msgid "'%s' not recognized as a git repository"
-msgstr "«%s» не распознан как репозиторий git"
+msgid "%s tracks both %s and %s"
+msgstr "%s отслеживает и %s и %s"
-#: submodule.c:1515
+#: remote.c:684
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
-msgstr "не удалось запустить «git status» в подмодуле «%s»"
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
-#: submodule.c:1528
+#: remote.c:694
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
-msgstr "не удалось запустить «git status» в подмодуле «%s»"
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
-#: submodule.c:1543
+#: remote.c:1000
#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
+msgid "src refspec %s does not match any"
msgstr ""
-#: submodule.c:1633
+#: remote.c:1005
#, c-format
-msgid "submodule '%s' has dirty index"
-msgstr "подмодуль «%s» имеет изменённый индекс"
+msgid "src refspec %s matches more than one"
+msgstr ""
-#: submodule.c:1685
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#: remote.c:1020
#, c-format
-msgid "Submodule '%s' could not be updated."
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: submodule.c:1734
+#: remote.c:1040
#, c-format
msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
-#: submodule.c:1746 submodule.c:1802
+#: remote.c:1045
#, c-format
-msgid "could not lookup name for submodule '%s'"
-msgstr "не удалось запросить имя подмодуля «%s»"
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
-#: submodule.c:1750 builtin/submodule--helper.c:1406
-#: builtin/submodule--helper.c:1416
+#: remote.c:1050
#, c-format
-msgid "could not create directory '%s'"
-msgstr "не удалось создать каталог «%s»"
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
-#: submodule.c:1753
+#: remote.c:1055
#, c-format
msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
-msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
-#: submodule.c:1837
+#: remote.c:1091
#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
+msgid "%s cannot be resolved to branch"
+msgstr ""
-#: submodule.c:1881
-msgid "could not start ls-files in .."
-msgstr "не удалось выполнить stat ls-files в .."
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr ""
-#: submodule.c:1920
+#: remote.c:1114
#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr "ls-tree вернул неожиданный код %d"
+msgid "dst refspec %s matches more than one"
+msgstr ""
-#: submodule-config.c:231
+#: remote.c:1121
#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнорирую подозрительный подмодуль с именем: %s"
+msgid "dst ref %s receives from more than one src"
+msgstr ""
-#: submodule-config.c:295
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
+msgstr "HEAD не указывает на ветку"
-#: submodule-config.c:468
+#: remote.c:1633
#, c-format
-msgid "invalid value for %s"
-msgstr "неправильное значение %s"
+msgid "no such branch: '%s'"
+msgstr "нет такой ветки: «%s»"
-#: trailer.c:238
+#: remote.c:1636
#, c-format
-msgid "running trailer command '%s' failed"
-msgstr "сбой при запуске команды завершителя «%s»"
+msgid "no upstream configured for branch '%s'"
+msgstr "вышестоящая ветка не настроена для ветки «%s»"
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: remote.c:1642
#, c-format
-msgid "unknown value '%s' for key '%s'"
-msgstr "неизвеÑ\81Ñ\82ное знаÑ\87ение «%s» длÑ\8f клÑ\8eÑ\87а «%s»"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89аÑ\8f веÑ\82ка «%s» не Ñ\81оÑ\85Ñ\80анена как оÑ\82Ñ\81леживаемаÑ\8f веÑ\82ка"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:294
+#: remote.c:1657
#, c-format
-msgid "more than one %s"
-msgstr "болÑ\8cÑ\88е одного %s"
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "назнаÑ\87ение длÑ\8f оÑ\82пÑ\80авки «%s» на внеÑ\88нем Ñ\81еÑ\80веÑ\80е «%s» не имееÑ\82 локалÑ\8cной оÑ\82Ñ\81леживаемой веÑ\82ки"
-#: trailer.c:730
+#: remote.c:1669
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
-msgstr "пÑ\83Ñ\81Ñ\82аÑ\8f поÑ\81леднÑ\8fÑ\8f лекÑ\81ема в завеÑ\80Ñ\88иÑ\82еле «%.*s»"
+msgid "branch '%s' has no remote for pushing"
+msgstr "веÑ\82ка «%s» не имееÑ\82 внеÑ\88него Ñ\81еÑ\80веÑ\80а длÑ\8f оÑ\82пÑ\80авки"
-#: trailer.c:750
+#: remote.c:1679
#, c-format
-msgid "could not read input file '%s'"
-msgstr "не удалось прочитать входной файл «%s»"
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
-#: trailer.c:753
-msgid "could not read from stdin"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "оÑ\82пÑ\80авка не имееÑ\82 Ñ\82оÑ\87ки назнаÑ\87ениÑ\8f (push.default вÑ\8bÑ\81Ñ\82авлен в «nothing»)"
-#: trailer.c:1008 builtin/am.c:47
-#, c-format
-msgid "could not stat %s"
-msgstr "не удалось выполнить stat для %s"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
-#: trailer.c:1010
+#: remote.c:1840
#, c-format
-msgid "file %s is not a regular file"
-msgstr "файл %s не является обычным файлом"
+msgid "couldn't find remote ref %s"
+msgstr ""
-#: trailer.c:1012
+#: remote.c:1853
#, c-format
-msgid "file %s is not writable by user"
-msgstr "файл %s не доступен на запись пользователю"
-
-#: trailer.c:1024
-msgid "could not open temporary file"
-msgstr "не удалось создать временный файл"
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
-#: trailer.c:1064
+#: remote.c:2016
#, c-format
-msgid "could not rename temporary file to %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пеÑ\80еименоваÑ\82Ñ\8c вÑ\80еменнÑ\8bй Ñ\84айл в %s"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Ð\92аÑ\88а веÑ\82ка базиÑ\80Ñ\83еÑ\82Ñ\81Ñ\8f на «%s», но вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ий Ñ\80епозиÑ\82оÑ\80ий иÑ\81Ñ\87ез.\n"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
-#: transport.c:142
+#: remote.c:2023
#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
-#: transport.c:208
+#: remote.c:2027
#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "транспорт: неправильный параметр глубины «%s»"
-
-#: transport.c:586
-msgid "could not parse transport.color.* config"
-msgstr "не удалось разобрать опцию transport.color.*"
-
-#: transport.c:659
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
-#: transport.c:785
+#: remote.c:2030
#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
+msgid " (use \"%s\" for details)\n"
+msgstr " (используйте «%s» для просмотра описания)\n"
-#: transport.c:851
+#: remote.c:2034
#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Ваша ветка опережает «%s» на %d коммит.\n"
+msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n"
+msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
+msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: transport.c:903
-msgid "git-over-rsync is no longer supported"
-msgstr ""
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: transport.c:998
+#: remote.c:2043
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "Ваша ветка отстает от «%s» на %d коммит и может быть перемотана вперед.\n"
+msgstr[1] "Ваша ветка отстает от «%s» на %d коммита и может быть перемотана вперед.\n"
+msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
+msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
+
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: transport.c:1002
+#: remote.c:2054
#, c-format
msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-
-#: transport.c:1010
-msgid "Aborting."
-msgstr "Прерываю."
-
-#: transport.c:1148
-msgid "failed to push all needed submodules"
-msgstr ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разный коммит в каждой соответственно.\n"
+msgstr[1] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммита в каждой соответственно.\n"
+msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
+msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-#: transport.c:1270 transport-helper.c:643
-msgid "operation not supported by protocol"
-msgstr ""
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-#: transport.c:1352
+#: remote.c:2247
#, c-format
-msgid "invalid line while parsing alternate refs: %s"
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: transport-helper.c:51 transport-helper.c:80
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:132
+#: replace-object.c:21
#, c-format
-msgid "unable to find remote helper for '%s'"
+msgid "bad replace ref name: %s"
msgstr ""
-#: transport-helper.c:148 transport-helper.c:557
-msgid "can't dup helper output fd"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: transport-helper.c:199
+#: replace-object.c:73
#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
+msgid "replace depth too high for object %s"
msgstr ""
-#: transport-helper.c:205
-msgid "this remote helper should implement refspec capability"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
-#, c-format
-msgid "%s unexpectedly said: '%s'"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: transport-helper.c:401
+#: rerere.c:495
#, c-format
-msgid "%s also locked %s"
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: transport-helper.c:479
-msgid "couldn't run fast-import"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: transport-helper.c:502
-msgid "error while running fast-import"
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: transport-helper.c:531 transport-helper.c:1091
+#: rerere.c:684
#, c-format
-msgid "could not read ref %s"
+msgid "failed utime() on '%s'"
msgstr ""
-#: transport-helper.c:576
+#: rerere.c:694
#, c-format
-msgid "unknown response to connect: %s"
+msgid "writing '%s' failed"
msgstr ""
-#: transport-helper.c:598
-msgid "setting remote service path not supported by protocol"
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: transport-helper.c:600
-msgid "invalid remote service path"
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: transport-helper.c:646
+#: rerere.c:788
#, c-format
-msgid "can't connect to subservice %s"
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: transport-helper.c:713
+#: rerere.c:803
#, c-format
-msgid "expected ok/error, helper said '%s'"
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: transport-helper.c:766
+#: rerere.c:807
#, c-format
-msgid "helper reported unexpected status of %s"
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: transport-helper.c:827
+#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
+msgid "could not create directory '%s'"
+msgstr "не удалось создать каталог «%s»"
-#: transport-helper.c:830
+#: rerere.c:1057
#, c-format
-msgid "helper %s does not support --signed"
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: transport-helper.c:833
+#: rerere.c:1068 rerere.c:1075
#, c-format
-msgid "helper %s does not support --signed=if-asked"
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: transport-helper.c:840
+#: rerere.c:1077
#, c-format
-msgid "helper %s does not support 'push-option'"
+msgid "cannot unlink '%s'"
msgstr ""
-#: transport-helper.c:932
-msgid "remote-helper doesn't support push; refspec needed"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: transport-helper.c:937
+#: rerere.c:1096
#, c-format
-msgid "helper %s does not support 'force'"
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: transport-helper.c:984
-msgid "couldn't run fast-export"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: transport-helper.c:989
-msgid "error while running fast-export"
-msgstr ""
+#: revision.c:2476
+msgid "your current branch appears to be broken"
+msgstr "похоже, ваша текущая ветка повреждена"
-#: transport-helper.c:1014
+#: revision.c:2479
#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
-#: transport-helper.c:1077
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
+#: revision.c:2679
+msgid "--first-parent is incompatible with --bisect"
+msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
-#: transport-helper.c:1230
-#, c-format
-msgid "read(%s) failed"
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: transport-helper.c:1257
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr "сбой открытия /dev/null"
-#: transport-helper.c:1306
+#: run-command.c:1269
#, c-format
-msgid "%s thread failed"
+msgid "cannot create async thread: %s"
msgstr ""
-#: transport-helper.c:1310
+#: run-command.c:1333
#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»."
-#: transport-helper.c:1329 transport-helper.c:1333
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
-#: transport-helper.c:1370
+#: send-pack.c:143
#, c-format
-msgid "%s process failed to wait"
-msgstr ""
+msgid "unable to parse remote unpack status: %s"
+msgstr "не удалось разобрать статус внешней распаковки: %s"
-#: transport-helper.c:1374
+#: send-pack.c:145
#, c-format
-msgid "%s process failed"
-msgstr ""
+msgid "remote unpack failed: %s"
+msgstr "сбой при внешней распаковке %s"
-#: transport-helper.c:1392 transport-helper.c:1401
-msgid "can't start thread for copying data"
-msgstr ""
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
+msgstr "сбой подписания сертификата отправки"
-#: tree-walk.c:33
-msgid "too-short tree object"
-msgstr "слишком короткий объект дерева"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
+msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
-msgstr "неправильный режим в записи дерева"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
+msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
-msgstr "пÑ\83Ñ\81Ñ\82ое имÑ\8f Ñ\84айла в запиÑ\81и деÑ\80ева"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
+msgstr "пÑ\80инимаÑ\8eÑ\89аÑ\8f Ñ\81Ñ\82оÑ\80она не поддеÑ\80живаеÑ\82 оÑ\82пÑ\80авкÑ\83 Ñ\81 опÑ\86ией --atomic"
-#: tree-walk.c:115
-msgid "too-short tree file"
-msgstr "слишком короткий файл дерева"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
+msgstr "принимающая сторона не поддерживает отправку с опциями"
-#: unpack-trees.c:112
+#: sequencer.c:187
#, 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Сделайте коммит или спрячьте ваши изменения перед переключением веток."
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "неправильный режим очистки сообщения коммита «%s»"
-#: unpack-trees.c:114
+#: sequencer.c:292
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
+msgid "could not delete '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: sequencer.c:318
+msgid "revert"
+msgstr "обратить изменения"
+
+#: sequencer.c:320
+msgid "cherry-pick"
+msgstr "копировать коммит"
+
+#: sequencer.c:322
+msgid "rebase -i"
+msgstr "rebase -i"
-#: unpack-trees.c:117
+#: sequencer.c:324
#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+#: sequencer.c:382
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 "Ð\92аÑ\88и локалÑ\8cнÑ\8bе изменениÑ\8f в Ñ\83казаннÑ\8bÑ\85 Ñ\84айлаÑ\85 бÑ\83дÑ\83Ñ\82 пеÑ\80езапиÑ\81анÑ\8b пÑ\80и Ñ\81лиÑ\8fнии:\n%%sСделайÑ\82е коммиÑ\82 или Ñ\81пÑ\80Ñ\8fÑ\87Ñ\8cÑ\82е ваÑ\88и изменениÑ\8f пеÑ\80ед Ñ\81лиÑ\8fнием веÑ\82ок."
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr "поÑ\81ле Ñ\80азÑ\80еÑ\88ениÑ\8f конÑ\84ликÑ\82ов, помеÑ\82Ñ\8cÑ\82е иÑ\81пÑ\80авленнÑ\8bе пÑ\83Ñ\82и\nÑ\81 помоÑ\89Ñ\8cÑ\8e «git add <пÑ\83Ñ\82и>» или «git rm <пÑ\83Ñ\82и>»"
-#: unpack-trees.c:119
-#, c-format
+#: sequencer.c:385
msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
+"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»"
-#: unpack-trees.c:122
+#: sequencer.c:398 sequencer.c:2801
#, 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."
+msgid "could not lock '%s'"
+msgstr "не удалось заблокировать «%s»"
-#: unpack-trees.c:124
+#: sequencer.c:405
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
-msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
+msgid "could not write eol to '%s'"
+msgstr "не удалось записать eol в «%s»"
-#: unpack-trees.c:129
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
-msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
+msgid "failed to finalize '%s'"
+msgstr "не удалось завершить «%s»"
-#: unpack-trees.c:133
+#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
+#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
+#: builtin/merge.c:1115 builtin/rebase.c:567
#, 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Переместите эти файлы или удалите их перед переключением веток."
+msgid "could not read '%s'"
+msgstr "не удалось прочитать «%s»"
-#: unpack-trees.c:135
+#: sequencer.c:459
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
+msgid "your local changes would be overwritten by %s."
+msgstr "ваши локальные изменения будут перезаписаны %s."
-#: unpack-trees.c:138
-#, 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Переместите эти файлы или удалите их перед переключением веток."
+#: sequencer.c:463
+msgid "commit your changes or stash them to proceed."
+msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-#: unpack-trees.c:140
+#: sequencer.c:495
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
+msgid "%s: fast-forward"
+msgstr "%s: перемотка вперед"
-#: unpack-trees.c:143
+#: sequencer.c:534 builtin/tag.c:555
#, 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."
+msgid "Invalid cleanup mode %s"
+msgstr "Неправильное значение режима очистки %s"
-#: unpack-trees.c:145
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#: sequencer.c:629
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
+msgid "%s: Unable to write new index file"
+msgstr "%s: Не удалось записать файл индекса"
-#: unpack-trees.c:151
-#, 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Переместите эти файлы или удалите их перед переключением веток."
+#: sequencer.c:646
+msgid "unable to update cache tree"
+msgstr "не удалось обновить дерево кэша"
-#: unpack-trees.c:153
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
+#: sequencer.c:660
+msgid "could not resolve HEAD commit"
+msgstr "не удалось распознать HEAD коммит"
-#: unpack-trees.c:156
+#: sequencer.c:740
#, 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Переместите эти файлы или удалите их перед переключением веток."
+msgid "no key present in '%.*s'"
+msgstr ""
-#: unpack-trees.c:158
+#: sequencer.c:751
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
+msgid "unable to dequote value of '%s'"
+msgstr ""
-#: unpack-trees.c:161
+#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
#, 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."
+msgid "could not open '%s' for reading"
+msgstr "не удалось открыть «%s» для чтения"
-#: unpack-trees.c:163
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
-msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
-#: unpack-trees.c:171
+#: sequencer.c:812
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие."
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
-#: unpack-trees.c:174
+#: sequencer.c:881
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
-#: unpack-trees.c:176
+#: sequencer.c:898
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
+msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
-#: unpack-trees.c:178
-#, c-format
+#: sequencer.c:992
+msgid "writing root commit"
+msgstr "запись коневого коммита"
+
+#: sequencer.c:1213
+msgid "'prepare-commit-msg' hook failed"
+msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
+
+#: sequencer.c:1220
msgid ""
-"The following working tree files would be removed by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: unpack-trees.c:180
-#, c-format
+#: sequencer.c:1233
msgid ""
-"Cannot update submodule:\n"
-"%s"
-msgstr "Не удолось обновить подмодуль:\n%s"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: unpack-trees.c:254
-#, c-format
-msgid "Aborting\n"
-msgstr "Прерываю\n"
+#: sequencer.c:1275
+msgid "couldn't look up newly created commit"
+msgstr "нельзя запросить новосозданный коммит"
-#: unpack-trees.c:336
-msgid "Checking out files"
-msgstr "РаÑ\81паковка Ñ\84айлов"
+#: sequencer.c:1277
+msgid "could not parse newly created commit"
+msgstr "нелÑ\8cзÑ\8f Ñ\80азобÑ\80аÑ\82Ñ\8c новоÑ\81озданнÑ\8bй коммиÑ\82"
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "Ð\9dепÑ\80авилÑ\8cнаÑ\8f имÑ\8f URL Ñ\81Ñ\85емÑ\8b или пÑ\80опÑ\83Ñ\89ен Ñ\81Ñ\83Ñ\84Ñ\84икÑ\81 «://»"
+#: sequencer.c:1323
+msgid "unable to resolve HEAD after creating commit"
+msgstr "не Ñ\83далоÑ\81Ñ\8c найÑ\82и HEAD поÑ\81ле Ñ\81озданиÑ\8f коммиÑ\82а"
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
-msgstr "неправильная управляющая последовательность %XX"
+#: sequencer.c:1325
+msgid "detached HEAD"
+msgstr "отделённый HEAD"
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr "пропущено имя сервера и схема доступа не «file:»"
+#: sequencer.c:1329
+msgid " (root-commit)"
+msgstr " (корневой коммит)"
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr "URL со схемой «file:» не может содержать номер порта"
+#: sequencer.c:1350
+msgid "could not parse HEAD"
+msgstr "не удалось разобрать HEAD"
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr "неправильные символы в имени сервера"
+#: sequencer.c:1352
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s не является коммитом!"
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
-msgstr "неправильный номер порта"
+#: sequencer.c:1356 builtin/commit.c:1551
+msgid "could not parse HEAD commit"
+msgstr "не удалось разобрать HEAD коммит"
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
-msgstr "неправильная часть пути «..»"
+#: sequencer.c:1408 sequencer.c:2001
+msgid "unable to parse commit author"
+msgstr "не удалось разобрать автора коммита"
-#: worktree.c:245 builtin/am.c:2147
-#, c-format
-msgid "failed to read '%s'"
-msgstr "не удалось прочитать «%s»"
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree не удалось записать дерево"
-#: worktree.c:291
+#: sequencer.c:1435 sequencer.c:1496
#, c-format
-msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
+msgid "unable to read commit message from '%s'"
+msgstr "не удалось прочитать сообщение коммита из «%s»"
-#: worktree.c:302
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
-msgstr ""
+#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650
+#: builtin/merge.c:882 builtin/merge.c:906
+msgid "failed to write commit object"
+msgstr "сбой записи объекта коммита"
-#: worktree.c:314
+#: sequencer.c:1523
#, c-format
-msgid "'%s' does not exist"
-msgstr "«%s» не существует"
+msgid "could not parse commit %s"
+msgstr "не удалось разобрать коммит %s"
-#: worktree.c:320
+#: sequencer.c:1528
#, c-format
-msgid "'%s' is not a .git file, error code %d"
-msgstr ""
+msgid "could not parse parent commit %s"
+msgstr "не удалось разобрать родительский коммит %s"
-#: worktree.c:328
+#: sequencer.c:1602 sequencer.c:1712
#, c-format
-msgid "'%s' does not point back to '%s'"
-msgstr ""
+msgid "unknown command: %d"
+msgstr "неизвестная команда: %d"
-#: wrapper.c:223 wrapper.c:393
+#: sequencer.c:1659 sequencer.c:1684
#, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f Ñ\87Ñ\82ениÑ\8f и запиÑ\81и"
+msgid "This is a combination of %d commits."
+msgstr "ÐÑ\82о обÑ\8aединение %d коммиÑ\82ов."
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
-#: builtin/am.c:863 builtin/merge.c:1078
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "не удалось открыть «%s» для чтения"
+#: sequencer.c:1669
+msgid "need a HEAD to fixup"
+msgstr "нужен HEAD для исправления"
-#: wrapper.c:424 wrapper.c:624
+#: sequencer.c:1671 sequencer.c:3111
+msgid "could not read HEAD"
+msgstr "не удалось прочитать HEAD"
+
+#: sequencer.c:1673
+msgid "could not read HEAD's commit message"
+msgstr "не удалось прочитать сообщение коммита текущего HEAD"
+
+#: sequencer.c:1679
#, c-format
-msgid "unable to access '%s'"
-msgstr "«%s» недоступно"
+msgid "cannot write '%s'"
+msgstr "не удалось записать «%s»"
-#: wrapper.c:632
-msgid "unable to get current working directory"
-msgstr "не Ñ\83далоÑ\81Ñ\8c полÑ\83Ñ\87иÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
+msgstr "ÐÑ\82о 1-е Ñ\81ообÑ\89ение коммиÑ\82а:"
-#: wt-status.c:154
-msgid "Unmerged paths:"
-msgstr "Не слитые пути:"
+#: sequencer.c:1694
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "не удалось прочитать сообщение коммита для %s"
-#: wt-status.c:181 wt-status.c:208
+#: sequencer.c:1701
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
+msgid "This is the commit message #%d:"
+msgstr "Это сообщение коммита номер #%d:"
-#: wt-status.c:183 wt-status.c:210
-msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
+#: sequencer.c:1707
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Сообщение коммита номер #%d будет пропущено:"
-#: wt-status.c:187
-msgid " (use \"git add <file>...\" to mark resolution)"
-msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
+#: sequencer.c:1795
+msgid "your index file is unmerged."
+msgstr "ваш индекс не слит."
-#: wt-status.c:189 wt-status.c:193
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
+#: sequencer.c:1802
+msgid "cannot fixup root commit"
+msgstr "нельзя исправить корневой коммит"
-#: wt-status.c:191
-msgid " (use \"git rm <file>...\" to mark resolution)"
-msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
+#: sequencer.c:1821
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
-#: wt-status.c:202 wt-status.c:1015
-msgid "Changes to be committed:"
-msgstr "Изменения, которые будут включены в коммит:"
+#: sequencer.c:1829 sequencer.c:1837
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "у коммита %s нет предка %d"
-#: wt-status.c:220 wt-status.c:1024
-msgid "Changes not staged for commit:"
-msgstr "Изменения, которые не в индексе для коммита:"
+#: sequencer.c:1843
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "не удалось получить сообщение коммита для %s"
-#: wt-status.c:224
-msgid " (use \"git add <file>...\" to update what will be committed)"
-msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1862
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: не удалось разобрать родительский коммит для %s"
-#: wt-status.c:226
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
+#: sequencer.c:1927
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "не удалось переименовать «%s» в «%s»"
-#: wt-status.c:227
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working "
-"directory)"
-msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
+#: sequencer.c:1982
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "не удалось обратить изменения коммита %s… %s"
-#: wt-status.c:229
-msgid " (commit or discard the untracked or modified content in submodules)"
-msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
+#: sequencer.c:1983
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "не удалось применить коммит %s… %s"
-#: wt-status.c:241
+#: sequencer.c:2042
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
+msgid "git %s: failed to read the index"
+msgstr "git %s: сбой чтения индекса"
-#: wt-status.c:256
-msgid "both deleted:"
-msgstr "оба удалены:"
+#: sequencer.c:2049
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: сбой обновления индекса"
-#: wt-status.c:258
-msgid "added by us:"
-msgstr "добавлено нами:"
+#: sequencer.c:2118
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "параметр %s не принимает аргументы: «%s»"
-#: wt-status.c:260
-msgid "deleted by them:"
-msgstr "удалено ими:"
+#: sequencer.c:2127
+#, c-format
+msgid "missing arguments for %s"
+msgstr "пропущены аргументы для %s"
-#: wt-status.c:262
-msgid "added by them:"
-msgstr "добавлено ими:"
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
+msgstr ""
-#: wt-status.c:264
-msgid "deleted by us:"
-msgstr "удалено нами:"
+#: sequencer.c:2226
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "неправильная строка %d: %.*s"
-#: wt-status.c:266
-msgid "both added:"
-msgstr "оба добавлены:"
+#: sequencer.c:2237
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
-#: wt-status.c:268
-msgid "both modified:"
-msgstr "оба изменены:"
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
+msgstr "не удалось прочитать «%s»."
-#: wt-status.c:278
-msgid "new file:"
-msgstr "новÑ\8bй Ñ\84айл:"
+#: sequencer.c:2360
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "пожалÑ\83йÑ\81Ñ\82а иÑ\81пÑ\80авÑ\8cÑ\82е Ñ\8dÑ\82о Ñ\81 помоÑ\89Ñ\8cÑ\8e «git rebase --edit-todo»."
-#: wt-status.c:280
-msgid "copied:"
-msgstr "скопировано:"
+#: sequencer.c:2362
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "непригодная для использования карта с инструкциями: «%s»"
-#: wt-status.c:282
-msgid "deleted:"
-msgstr "удалено:"
+#: sequencer.c:2367
+msgid "no commits parsed."
+msgstr "коммиты не разобраны."
-#: wt-status.c:284
-msgid "modified:"
-msgstr "изменено:"
+#: sequencer.c:2378
+msgid "cannot cherry-pick during a revert."
+msgstr "нелÑ\8cзÑ\8f Ñ\81копиÑ\80оваÑ\82Ñ\8c коммиÑ\82 во вÑ\80емÑ\8f пÑ\80оÑ\86еÑ\81Ñ\81а обÑ\80аÑ\89ениÑ\8f коммиÑ\82а."
-#: wt-status.c:286
-msgid "renamed:"
-msgstr "пеÑ\80еименовано:"
+#: sequencer.c:2380
+msgid "cannot revert during a cherry-pick."
+msgstr "нелÑ\8cзÑ\8f обÑ\80аÑ\82иÑ\82Ñ\8c изменениÑ\8f коммиÑ\82а во вÑ\80емÑ\8f копиÑ\80ованиÑ\8f коммиÑ\82а."
-#: wt-status.c:288
-msgid "typechange:"
-msgstr "изменен тип:"
+#: sequencer.c:2462
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "неправильное значение %s: %s"
-#: wt-status.c:290
-msgid "unknown:"
-msgstr "неизвеÑ\81Ñ\82но:"
+#: sequencer.c:2549
+msgid "unusable squash-onto"
+msgstr "непÑ\80игоднÑ\8bй длÑ\8f иÑ\81полÑ\8cзованиÑ\8f Ñ\83плоÑ\82ниÑ\82Ñ\8c-над"
-#: wt-status.c:292
-msgid "unmerged:"
-msgstr "не слитые:"
+#: sequencer.c:2565
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "испорченная карта с опциями: «%s»"
-#: wt-status.c:372
-msgid "new commits, "
-msgstr "новÑ\8bе коммиÑ\82Ñ\8b, "
+#: sequencer.c:2648 sequencer.c:4227
+msgid "empty commit set passed"
+msgstr "пеÑ\80едан пÑ\83Ñ\81Ñ\82ой набоÑ\80 коммиÑ\82ов"
-#: wt-status.c:374
-msgid "modified content, "
-msgstr "изменено Ñ\81одеÑ\80жимое, "
+#: sequencer.c:2656
+msgid "a cherry-pick or revert is already in progress"
+msgstr "копиÑ\80ование или обÑ\80аÑ\89ение изменений коммиÑ\82а Ñ\83же вÑ\8bполнÑ\8fÑ\8eÑ\82Ñ\81Ñ\8f"
-#: wt-status.c:376
-msgid "untracked content, "
-msgstr "неоÑ\82Ñ\81леживаемое Ñ\81одеÑ\80жимое, "
+#: sequencer.c:2657
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "попÑ\80обÑ\83йÑ\82е «git cherry-pick (--continue | --quit | --abort)»"
-#: wt-status.c:853
+#: sequencer.c:2660
#, 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:885
-msgid "Submodules changed but not updated:"
-msgstr "Измененные, но не обновленные подмодули:"
+msgid "could not create sequencer directory '%s'"
+msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-#: wt-status.c:887
-msgid "Submodule changes to be committed:"
-msgstr "Ð\98зменениÑ\8f в подмодÑ\83лÑ\8fÑ\85, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 закоммиÑ\87енÑ\8b:"
+#: sequencer.c:2674
+msgid "could not lock HEAD"
+msgstr "не Ñ\83далоÑ\81Ñ\8c заблокиÑ\80оваÑ\82Ñ\8c HEAD"
-#: wt-status.c:969
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано."
+#: sequencer.c:2729 sequencer.c:3979
+msgid "no cherry-pick or revert in progress"
+msgstr "копирование или обращение изменений коммита уже выполняются"
-#: wt-status.c:1084
-msgid "You have unmerged paths."
-msgstr "У ваÑ\81 еÑ\81Ñ\82Ñ\8c не Ñ\81лиÑ\82Ñ\8bе пÑ\83Ñ\82и."
+#: sequencer.c:2731
+msgid "cannot resolve HEAD"
+msgstr "не Ñ\83далоÑ\81Ñ\8c опÑ\80еделиÑ\82Ñ\8c HEAD"
-#: wt-status.c:1087
-msgid " (fix conflicts and run \"git commit\")"
-msgstr " (разрешите конфликты, затем запустите «git commit»)"
+#: sequencer.c:2733 sequencer.c:2768
+msgid "cannot abort from a branch yet to be born"
+msgstr "нельзя отменить изменения с ветки, которая еще не создана"
-#: wt-status.c:1089
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
+#: sequencer.c:2754 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
+msgstr "не удалось открыть «%s»"
-#: wt-status.c:1094
-msgid "All conflicts fixed but you are still merging."
-msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
+#: sequencer.c:2756
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "не удалось прочитать «%s»: %s"
-#: wt-status.c:1097
-msgid " (use \"git commit\" to conclude merge)"
-msgstr " (используйте «git commit», чтобы завершить слияние)"
+#: sequencer.c:2757
+msgid "unexpected end of file"
+msgstr "неожиданный конец файла"
-#: wt-status.c:1107
-msgid "You are in the middle of an am session."
-msgstr "Вы в процессе сессии am."
+#: sequencer.c:2763
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-#: wt-status.c:1110
-msgid "The current patch is empty."
-msgstr "ТекÑ\83Ñ\89ий паÑ\82Ñ\87 пÑ\83Ñ\81Ñ\82ой."
+#: sequencer.c:2774
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "Ð\9fоÑ\85оже, Ñ\87Ñ\82о вÑ\8b пеÑ\80емеÑ\81Ñ\82или HEAD. Ð\9fеÑ\80емоÑ\82ка не вÑ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f, пÑ\80овеÑ\80Ñ\8cÑ\82е Ñ\81вой Ñ\83казаÑ\82елÑ\8c HEAD!"
-#: wt-status.c:1114
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
+#: sequencer.c:2903 sequencer.c:3894
+#, c-format
+msgid "could not update %s"
+msgstr "не удалось обновить %s"
-#: wt-status.c:1116
-msgid " (use \"git am --skip\" to skip this patch)"
-msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
+#: sequencer.c:2941 sequencer.c:3874
+msgid "cannot read HEAD"
+msgstr "не удалось прочитать HEAD"
-#: wt-status.c:1118
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
+#: sequencer.c:2958
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
-#: wt-status.c:1250
-msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo отсутствует."
+#: sequencer.c:2966
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
-#: wt-status.c:1252
-msgid "No commands done."
-msgstr "Команды не выполнены."
+#: sequencer.c:2976
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
-#: wt-status.c:1255
+#: sequencer.c:2983
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "Последняя команда выполнена (%d команда выполнена):"
-msgstr[1] "Последняя команда выполнена (%d команды выполнено):"
-msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
-msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
+msgid "Could not merge %.*s"
+msgstr ""
-#: wt-status.c:1266
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
#, c-format
-msgid " (see more in file %s)"
-msgstr " (смотрите дополнительно в файле %s)"
+msgid "could not copy '%s' to '%s'"
+msgstr "не удалось скопировать «%s» в «%s»"
-#: wt-status.c:1271
-msgid "No commands remaining."
-msgstr "Команд больше не осталось."
+#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839
+#: builtin/rebase.c:1580 builtin/rebase.c:1940 builtin/rebase.c:1995
+msgid "could not read index"
+msgstr "не удалось прочитать индекс"
-#: wt-status.c:1274
+#: sequencer.c:3028
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "Следующая команда для выполнения (%d команда осталась):"
-msgstr[1] "Следующая команда для выполнения (%d команды осталось):"
-msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
-msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n"
-#: wt-status.c:1282
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
+#: sequencer.c:3034
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
-#: wt-status.c:1295
+#: sequencer.c:3040
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n"
-#: wt-status.c:1300
-msgid "You are currently rebasing."
-msgstr "Вы сейчас перемещаете ветку."
+#: sequencer.c:3101
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
-#: wt-status.c:1314
-msgid " (fix conflicts and then run \"git rebase --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
+#: sequencer.c:3155
+msgid "writing fake root commit"
+msgstr "запись поддельного корневого коммита"
-#: wt-status.c:1316
-msgid " (use \"git rebase --skip\" to skip this patch)"
-msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
+#: sequencer.c:3160
+msgid "writing squash-onto"
+msgstr "запить уплотнить-над"
-#: wt-status.c:1318
-msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "не удалось найти дерево для %s"
-#: wt-status.c:1324
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
-msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
+#: sequencer.c:3216 builtin/rebase.c:863
+msgid "could not write index"
+msgstr "не удалось записать индекс"
-#: wt-status.c:1328
+#: sequencer.c:3243
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
-
-#: wt-status.c:1333
-msgid "You are currently splitting a commit during a rebase."
-msgstr "Вы сейчас разделяете коммит при перемещении ветки."
+msgid "could not resolve '%s'"
+msgstr "не удалось распознать «%s»"
-#: wt-status.c:1336
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
+#: sequencer.c:3271
+msgid "cannot merge without a current revision"
+msgstr "нельзя слить без текущей редакции"
-#: wt-status.c:1340
+#: sequencer.c:3293
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»."
-
-#: wt-status.c:1345
-msgid "You are currently editing a commit during a rebase."
-msgstr "Вы сейчас редактируете коммит при перемещении ветки."
+msgid "unable to parse '%.*s'"
+msgstr ""
-#: wt-status.c:1348
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
+#: sequencer.c:3302
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
-#: wt-status.c:1350
-msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
+#: sequencer.c:3314
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
-#: wt-status.c:1360
+#: sequencer.c:3329
#, c-format
-msgid "You are currently cherry-picking commit %s."
-msgstr "Вы копируете коммит %s."
-
-#: wt-status.c:1365
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
+msgid "could not get commit message of '%s'"
+msgstr "не удалось получить сообщение коммита для «%s»"
-#: wt-status.c:1368
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
+#: sequencer.c:3478
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "не удалось даже попытаться слить «%.*s»"
-#: wt-status.c:1370
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
+#: sequencer.c:3494
+msgid "merge: Unable to write new index file"
+msgstr "слияние: Не удалось записать файл индекса"
-#: wt-status.c:1379
+#: sequencer.c:3562 builtin/rebase.c:711
#, c-format
-msgid "You are currently reverting commit %s."
-msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 обÑ\80аÑ\89аеÑ\82е изменениÑ\8f коммиÑ\82а %s."
+msgid "Applied autostash.\n"
+msgstr "Ð\9fÑ\80имененÑ\8b авÑ\82омаÑ\82иÑ\87еÑ\81ки Ñ\81пÑ\80Ñ\8fÑ\82аннÑ\8bе изменениÑ\8f.\n"
-#: wt-status.c:1384
-msgid " (fix conflicts and run \"git revert --continue\")"
-msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
+#: sequencer.c:3574
+#, c-format
+msgid "cannot store %s"
+msgstr "не удалось сохранить %s"
-#: wt-status.c:1387
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
+#: sequencer.c:3577 builtin/rebase.c:727
+#, 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"
-#: wt-status.c:1389
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
+#: sequencer.c:3638
+#, c-format
+msgid "could not checkout %s"
+msgstr ""
-#: wt-status.c:1400
+#: sequencer.c:3652
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
+msgid "%s: not a valid OID"
+msgstr ""
-#: wt-status.c:1404
-msgid "You are currently bisecting."
-msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 в пÑ\80оÑ\86еÑ\81Ñ\81е двоиÑ\87ного поиÑ\81ка."
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82делиÑ\82Ñ\8c HEAD"
-#: wt-status.c:1407
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
+#: sequencer.c:3672
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
-#: wt-status.c:1604
-msgid "On branch "
-msgstr "На ветке "
+#: sequencer.c:3674
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
-#: wt-status.c:1610
-msgid "interactive rebase in progress; onto "
-msgstr "интерактивное перемещение в процессе; над "
+#: sequencer.c:3682
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+msgstr ""
-#: wt-status.c:1612
-msgid "rebase in progress; onto "
-msgstr "перемещение в процессе; над "
+#: sequencer.c:3759
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Остановлено на %s … %.*s\n"
-#: wt-status.c:1617
-msgid "HEAD detached at "
-msgstr "HEAD отделён на "
+#: sequencer.c:3837
+#, c-format
+msgid "unknown command %d"
+msgstr "неизвестная команда %d"
-#: wt-status.c:1619
-msgid "HEAD detached from "
-msgstr "HEAD отделён начиная с "
+#: sequencer.c:3882
+msgid "could not read orig-head"
+msgstr "не удалось прочитать orig-head"
-#: wt-status.c:1622
-msgid "Not currently on any branch."
-msgstr "СейÑ\87аÑ\81 ни на одной из веÑ\82ок"
+#: sequencer.c:3887
+msgid "could not read 'onto'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c «onto»"
-#: wt-status.c:1642
-msgid "Initial commit"
-msgstr "Начальный коммит"
+#: sequencer.c:3901
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "не удалось обновить HEAD на %s"
-#: wt-status.c:1643
-msgid "No commits yet"
-msgstr "Ð\95Ñ\89е неÑ\82 коммиÑ\82ов"
+#: sequencer.c:3991
+msgid "cannot rebase: You have unstaged changes."
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c пеÑ\80емеÑ\89ение коммиÑ\82ов: У ваÑ\81 еÑ\81Ñ\82Ñ\8c непÑ\80оиндекÑ\81иÑ\80ованнÑ\8bе изменениÑ\8f."
-#: wt-status.c:1657
-msgid "Untracked files"
-msgstr "Ð\9dеоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b"
+#: sequencer.c:4000
+msgid "cannot amend non-existing commit"
+msgstr "не Ñ\83далоÑ\81Ñ\8c иÑ\81пÑ\80авиÑ\82Ñ\8c неÑ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ий коммиÑ\82"
-#: wt-status.c:1659
-msgid "Ignored files"
-msgstr "Игнорируемые файлы"
+#: sequencer.c:4002
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "недопустимый файл: «%s»"
-#: wt-status.c:1663
+#: sequencer.c:4004
#, c-format
+msgid "invalid contents: '%s'"
+msgstr "недопустимое содержимое: «%s»"
+
+#: sequencer.c:4007
msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
-msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
+"\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» снова."
-#: wt-status.c:1669
+#: sequencer.c:4043 sequencer.c:4081
#, c-format
-msgid "Untracked files not listed%s"
-msgstr "Неотслеживаемые файлы не показаны%s"
+msgid "could not write file: '%s'"
+msgstr ""
-#: wt-status.c:1671
-msgid " (use -u option to show untracked files)"
-msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
+#: sequencer.c:4096
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "не удалось удалить CHERRY_PICK_HEAD"
-#: wt-status.c:1677
-msgid "No changes"
-msgstr "Ð\9dеÑ\82 изменений"
+#: sequencer.c:4103
+msgid "could not commit staged changes."
+msgstr "не Ñ\83далоÑ\81Ñ\8c закоммиÑ\82иÑ\82Ñ\8c пÑ\80оиндекÑ\81иÑ\80ованнÑ\8bе изменениÑ\8f."
-#: wt-status.c:1682
+#: sequencer.c:4204
#, 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"
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: не удалось скопировать коммит %s"
-#: wt-status.c:1685
+#: sequencer.c:4208
#, c-format
-msgid "no changes added to commit\n"
-msgstr "нет изменений добавленных для коммита\n"
+msgid "%s: bad revision"
+msgstr "%s: плохая редакция"
-#: wt-status.c:1688
-#, c-format
+#: sequencer.c:4243
+msgid "can't revert as initial commit"
+msgstr "нельзя возвратить изначальный коммит"
+
+#: sequencer.c:4686
+msgid "make_script: unhandled options"
+msgstr "make_script: не обработанные опции"
+
+#: sequencer.c:4689
+msgid "make_script: error preparing revisions"
+msgstr "make_script: ошибка при обновлении редакций"
+
+#: sequencer.c:4847
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
-msgstr "ниÑ\87его не добавлено в коммиÑ\82, но еÑ\81Ñ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b (иÑ\81полÑ\8cзÑ\83йÑ\82е «git add», Ñ\87Ñ\82обÑ\8b оÑ\82Ñ\81леживаÑ\82Ñ\8c иÑ\85)\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr "Ð\92Ñ\8b можеÑ\82е иÑ\81пÑ\80авиÑ\82Ñ\8c Ñ\8dÑ\82о Ñ\81 помоÑ\89Ñ\8cÑ\8e «git rebase --edit-todo», а поÑ\82ом запÑ\83Ñ\81Ñ\82ив «git rebase --continue».\nÐ\98ли вÑ\8b можеÑ\82е пÑ\80еÑ\80ваÑ\82Ñ\8c пÑ\80оÑ\86еÑ\81Ñ\81 пеÑ\80емеÑ\89ениÑ\8f, вÑ\8bполнив «git rebase --abort»\n"
-#: wt-status.c:1691
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
-msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
+msgstr ""
-#: wt-status.c:1694
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
+msgstr ""
-#: wt-status.c:1697 wt-status.c:1702
-#, c-format
-msgid "nothing to commit\n"
-msgstr "нечего коммитить\n"
+#: sequencer.c:5073
+msgid "the script was already rearranged."
+msgstr "сценарий уже был перестроен."
-#: wt-status.c:1700
+#: setup.c:123
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
+msgid "'%s' is outside repository"
+msgstr "«%s» вне репозитория"
-#: wt-status.c:1704
+#: setup.c:173
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
+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 <команда> -- <путь>…» для указания путей, которые не существуют локально."
-#: wt-status.c:1817
-msgid "No commits yet on "
-msgstr "Еще нет коммитов в"
+#: setup.c:186
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: wt-status.c:1821
-msgid "HEAD (no branch)"
-msgstr "HEAD (нет ветки)"
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
-#: wt-status.c:1852
-msgid "different"
-msgstr "отличается"
+#: setup.c:254
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: wt-status.c:1854 wt-status.c:1862
-msgid "behind "
-msgstr "позади"
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
+msgstr ""
-#: wt-status.c:1857 wt-status.c:1860
-msgid "ahead "
-msgstr "впереди "
+#: setup.c:394
+msgid "this operation must be run in a work tree"
+msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2376
+#: setup.c:540
#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c %s: У ваÑ\81 еÑ\81Ñ\82Ñ\8c непÑ\80оиндекÑ\81иÑ\80ованнÑ\8bе изменениÑ\8f."
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Ð\9eжидаемаÑ\8f веÑ\80Ñ\81иÑ\8f git Ñ\80епозиÑ\82оÑ\80иÑ\8f <= %d, а обнаÑ\80Ñ\83жена %d"
-#: wt-status.c:2382
-msgid "additionally, your index contains uncommitted changes."
-msgstr "к Ñ\82омÑ\83 же, в ваÑ\88ем индекÑ\81е еÑ\81Ñ\82Ñ\8c незакоммиÑ\87еннÑ\8bе изменениÑ\8f."
+#: setup.c:548
+msgid "unknown repository extensions found:"
+msgstr "обнаÑ\80Ñ\83женÑ\8b неизвеÑ\81Ñ\82нÑ\8bе Ñ\80аÑ\81Ñ\88иÑ\80ениÑ\8f Ñ\80епозиÑ\82оÑ\80иÑ\8f:"
-#: wt-status.c:2384
+#: setup.c:567
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c %s: Ð\92 ваÑ\88ем индекÑ\81е еÑ\81Ñ\82Ñ\8c незакоммиÑ\87еннÑ\8bе изменениÑ\8f."
+msgid "error opening '%s'"
+msgstr "оÑ\88ибка оÑ\82кÑ\80Ñ\8bÑ\82иÑ\8f «%s»"
-#: compat/precompose_utf8.c:58 builtin/clone.c:443
+#: setup.c:569
#, c-format
-msgid "failed to unlink '%s'"
-msgstr "сбой отсоединения «%s»"
-
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<опции>] [--] <спецификатор-пути>…"
+msgid "too large to be a .git file: '%s'"
+msgstr "файл слишком большой как для .git файла: «%s»"
-#: builtin/add.c:83
+#: setup.c:571
#, c-format
-msgid "unexpected diff status %c"
-msgstr "неожиданный статус различий %c"
-
-#: builtin/add.c:88 builtin/commit.c:279
-msgid "updating files failed"
-msgstr "сбой при обновлении файлов"
+msgid "error reading %s"
+msgstr "ошибка чтения %s"
-#: builtin/add.c:98
+#: setup.c:573
#, c-format
-msgid "remove '%s'\n"
-msgstr "удалить «%s»\n"
-
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
-msgstr "Непроиндексированные изменения после обновления индекса:"
+msgid "invalid gitfile format: %s"
+msgstr "неправильный формат файла gitfile: %s"
-#: builtin/add.c:233 builtin/rev-parse.c:893
-msgid "Could not read the index"
-msgstr "Не удалось прочитать индекс"
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "нет пути в gitfile: %s"
-#: builtin/add.c:244
+#: setup.c:577
#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s» длÑ\8f запиÑ\81и."
+msgid "not a git repository: %s"
+msgstr "не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ием git: %s"
-#: builtin/add.c:248
-msgid "Could not write patch"
-msgstr "Не удалось записать патч"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
+msgstr "«$%s» слишком большой"
-#: builtin/add.c:251
-msgid "editing patch failed"
-msgstr "сбой при редактировании патча"
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "не является репозиторием git: «%s»"
-#: builtin/add.c:254
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
-msgid "Could not stat '%s'"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat длÑ\8f «%s»"
+msgid "cannot chdir to '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c chdir в «%s»"
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
-msgstr "Ð\9fÑ\83Ñ\81Ñ\82ой паÑ\82Ñ\87. Ð\9eпеÑ\80аÑ\86иÑ\8f пÑ\80еÑ\80вана."
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
+msgstr "не Ñ\83далоÑ\81Ñ\8c веÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f в cwd"
-#: builtin/add.c:261
+#: setup.c:851
#, c-format
-msgid "Could not apply '%s'"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80имениÑ\82Ñ\8c «%s»"
+msgid "failed to stat '%*s%s%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat длÑ\8f «%*s%s%s»"
-#: builtin/add.c:269
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "СледÑ\83Ñ\8eÑ\89ие пÑ\83Ñ\82и игноÑ\80иÑ\80Ñ\83Ñ\8eÑ\82Ñ\81Ñ\8f одним из ваÑ\88иÑ\85 Ñ\84айлов .gitignore:\n"
+#: setup.c:1083
+msgid "Unable to read current working directory"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
-#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165
-msgid "dry run"
-msgstr "пробный запуск"
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "не удалось изменить на «%s»"
-#: builtin/add.c:292
-msgid "interactive picking"
-msgstr "интерактивный выбор"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "не найден git репозиторий (или один из родительских каталогов): %s"
-#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
-msgid "select hunks interactively"
-msgstr "интерактивный выбор блоков"
+#: setup.c:1109
+#, 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 не установлен)."
-#: builtin/add.c:294
-msgid "edit current diff and apply"
-msgstr "отредактировать текущий файл различий и применить его"
+#: setup.c:1220
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
-#: builtin/add.c:295
-msgid "allow adding otherwise ignored files"
-msgstr "Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c добавление игноÑ\80иÑ\80Ñ\83емÑ\8bÑ\85 инаÑ\87е Ñ\84айлов"
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
+msgstr "Ñ\81бой оÑ\82кÑ\80Ñ\8bÑ\82иÑ\8f /dev/null или дÑ\83блиÑ\80ованиÑ\8f деÑ\81кÑ\80ипÑ\82оÑ\80а"
-#: builtin/add.c:296
-msgid "update tracked files"
-msgstr "обновить отслеживаемые файлы"
+#: setup.c:1279
+msgid "fork failed"
+msgstr "сбой при выполнении fork"
-#: builtin/add.c:297
-msgid "renormalize EOL of tracked files (implies -u)"
-msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
+#: setup.c:1284
+msgid "setsid failed"
+msgstr "сбой при выполнении setsid"
-#: builtin/add.c:298
-msgid "record only the fact that the path will be added later"
-msgstr "записать только факт, что путь будет добавлен позже"
+#: sha1-file.c:453
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
-#: builtin/add.c:299
-msgid "add changes from all tracked and untracked files"
-msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
+#: sha1-file.c:504
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
-#: builtin/add.c:302
-msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
+#: sha1-file.c:576
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
-#: builtin/add.c:304
-msgid "don't add, only refresh the index"
-msgstr "не добавлять, только обновить индекс"
+#: sha1-file.c:583
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
-#: builtin/add.c:305
-msgid "just skip files which cannot be added because of errors"
-msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
-#: builtin/add.c:306
-msgid "check if - even missing - files are ignored in dry run"
-msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске"
+#: sha1-file.c:644
+msgid "unable to read alternates file"
+msgstr ""
-#: builtin/add.c:308 builtin/update-index.c:973
-msgid "override the executable bit of the listed files"
-msgstr "переопределить бит выполнения на указанных файлах"
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
+msgstr ""
-#: builtin/add.c:310
-msgid "warn when adding an embedded repository"
-msgstr "предупреждать при добавлении встроенного git репозитория"
+#: sha1-file.c:686
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "путь «%s» не существует"
-#: builtin/add.c:325
+#: sha1-file.c:712
#, 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»."
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-#: builtin/add.c:353
+#: sha1-file.c:718
#, c-format
-msgid "adding embedded git repository: %s"
-msgstr "добавление встроенного git репозитория: %s"
+msgid "reference repository '%s' is not a local repository."
+msgstr "ссылаемый репозиторий «%s» не является локальным."
-#: builtin/add.c:371
+#: sha1-file.c:724
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
+msgid "reference repository '%s' is shallow"
+msgstr "ссылаемый репозиторий «%s» является частичным"
-#: builtin/add.c:379
-msgid "adding files failed"
-msgstr "ошибка при добавлении файлов"
+#: sha1-file.c:732
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "ссылаемый репозиторий «%s» является сращенным"
-#: builtin/add.c:417
-msgid "-A and -u are mutually incompatible"
-msgstr "-A и -u нельзя использовать одновременно"
+#: sha1-file.c:846
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
-#: builtin/add.c:424
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
+#: sha1-file.c:871
+msgid "mmap failed"
+msgstr ""
-#: builtin/add.c:428
+#: sha1-file.c:1035
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
-msgstr "параметр --chmod «%s» должен быть -x или +x"
+msgid "object file %s is empty"
+msgstr ""
-#: builtin/add.c:443
+#: sha1-file.c:1159 sha1-file.c:2297
#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Ничего не указано, ничего не добавлено.\n"
+msgid "corrupt loose object '%s'"
+msgstr ""
-#: builtin/add.c:444
+#: sha1-file.c:1161 sha1-file.c:2301
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Возможно, вы имели в виду «git add .»?\n"
+msgid "garbage at end of loose object '%s'"
+msgstr ""
-#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
-#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
-#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
-#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329
-msgid "index file corrupt"
-msgstr "файл индекса поврежден"
+#: sha1-file.c:1203
+msgid "invalid object type"
+msgstr ""
-#: builtin/am.c:415
-msgid "could not parse author script"
-msgstr "не удалось разобрать сценарий авторства"
+#: sha1-file.c:1287
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
-#: builtin/am.c:499
+#: sha1-file.c:1290
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "«%s» был удален перехватчиком applypatch-msg"
+msgid "unable to unpack %s header"
+msgstr ""
-#: builtin/am.c:540
+#: sha1-file.c:1296
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Неправильная строка ввода: «%s»."
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
-#: builtin/am.c:577
+#: sha1-file.c:1299
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Не удалось скопировать заметку из «%s» в «%s»"
+msgid "unable to parse %s header"
+msgstr ""
-#: builtin/am.c:603
-msgid "fseek failed"
-msgstr "сбой при выполнении fseek"
+#: sha1-file.c:1490
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
-#: builtin/am.c:791
+#: sha1-file.c:1494
#, c-format
-msgid "could not parse patch '%s'"
-msgstr "не удалось разобрать патч «%s»"
+msgid "replacement %s not found for %s"
+msgstr ""
-#: builtin/am.c:856
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Только серия патчей StGIT может быть применена за раз"
+#: sha1-file.c:1498
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
-#: builtin/am.c:904
-msgid "invalid timestamp"
-msgstr "недопустимая метка даты/времени"
+#: sha1-file.c:1502
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
-#: builtin/am.c:909 builtin/am.c:921
-msgid "invalid Date line"
-msgstr "недопустимая строка даты"
+#: sha1-file.c:1604
+#, c-format
+msgid "unable to write file %s"
+msgstr ""
-#: builtin/am.c:916
-msgid "invalid timezone offset"
-msgstr "недопустимое смещение часового пояса"
+#: sha1-file.c:1611
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
-#: builtin/am.c:1009
-msgid "Patch format detection failed."
-msgstr "Сбой определения формата патча."
+#: sha1-file.c:1618
+msgid "file write error"
+msgstr ""
+
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
+msgstr ""
-#: builtin/am.c:1014 builtin/clone.c:408
+#: sha1-file.c:1702
#, c-format
-msgid "failed to create directory '%s'"
-msgstr "не удалось создать каталог «%s»"
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
-#: builtin/am.c:1019
-msgid "Failed to split patches."
-msgstr "Не удалось разделить патчи на части."
+#: sha1-file.c:1704
+msgid "unable to create temporary file"
+msgstr ""
-#: builtin/am.c:1149 builtin/commit.c:364
-msgid "unable to write index file"
-msgstr "не удалось записать индекс"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
+msgstr ""
-#: builtin/am.c:1163
+#: sha1-file.c:1734
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
-#: builtin/am.c:1164
+#: sha1-file.c:1738
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
-#: builtin/am.c:1165
+#: sha1-file.c:1742
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
-
-#: builtin/am.c:1272
-msgid "Patch is empty."
-msgstr "Патч пустой."
+msgid "confused by unstable object source data for %s"
+msgstr ""
-#: builtin/am.c:1338
+#: sha1-file.c:1752 builtin/pack-objects.c:920
#, c-format
-msgid "invalid ident line: %.*s"
-msgstr "неправильная строка идентификации: %.*s"
+msgid "failed utime() on %s"
+msgstr ""
-#: builtin/am.c:1360
+#: sha1-file.c:1827
#, c-format
-msgid "unable to parse commit %s"
-msgstr "не удалось разобрать коммит %s"
-
-#: builtin/am.c:1556
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
+msgid "cannot read object for %s"
+msgstr ""
-#: builtin/am.c:1558
-msgid "Using index info to reconstruct a base tree..."
-msgstr "Использую индекс для реконструкции базового дерева…"
+#: sha1-file.c:1867
+msgid "corrupt commit"
+msgstr ""
-#: builtin/am.c:1577
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
+#: sha1-file.c:1875
+msgid "corrupt tag"
+msgstr ""
-#: builtin/am.c:1583
-msgid "Falling back to patching base and 3-way merge..."
-msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
+#: sha1-file.c:1974
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
-#: builtin/am.c:1608
-msgid "Failed to merge in the changes."
-msgstr "Не удалось слить изменения."
+#: sha1-file.c:1977
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
-#: builtin/am.c:1640
-msgid "applying to an empty history"
-msgstr "применение к пустой истории"
+#: sha1-file.c:2050 sha1-file.c:2059
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
-#: builtin/am.c:1686 builtin/am.c:1690
+#: sha1-file.c:2065
#, c-format
-msgid "cannot resume: %s does not exist."
-msgstr "нельзя продолжнить: %s не существует "
+msgid "%s: unsupported file type"
+msgstr ""
-#: builtin/am.c:1706
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
+#: sha1-file.c:2089
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
-#: builtin/am.c:1711
-msgid "Commit Body is:"
-msgstr "Тело коммита:"
+#: sha1-file.c:2091
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s не является действительным объектом «%s»"
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#: builtin/am.c:1721
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
+#: sha1-file.c:2118 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
+msgstr "не удалось открыть %s"
-#: builtin/am.c:1771
+#: sha1-file.c:2308 sha1-file.c:2360
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "Ð\98ндекÑ\81 не пÑ\83Ñ\81Ñ\82ой: нелÑ\8cзÑ\8f пÑ\80именÑ\8fÑ\82Ñ\8c паÑ\82Ñ\87и (в индекÑ\81е: %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "неÑ\81ооÑ\82веÑ\82Ñ\81Ñ\82вие Ñ\85еÑ\88-Ñ\81Ñ\83ммÑ\8b %s (ожидаеÑ\82Ñ\81Ñ\8f %s)"
-#: builtin/am.c:1811 builtin/am.c:1879
+#: sha1-file.c:2332
#, c-format
-msgid "Applying: %.*s"
-msgstr "Применение: %.*s"
+msgid "unable to mmap %s"
+msgstr ""
-#: builtin/am.c:1828
-msgid "No changes -- Patch already applied."
-msgstr "Нет изменений — Патч уже применен."
+#: sha1-file.c:2337
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
-#: builtin/am.c:1834
+#: sha1-file.c:2343
#, c-format
-msgid "Patch failed at %s %.*s"
-msgstr "Ошибка применения изменений на %s %.*s"
+msgid "unable to parse header of %s"
+msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: sha1-file.c:2354
+#, c-format
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/am.c:1882
-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Если ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
+#: sha1-name.c:490
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
+
+#: sha1-name.c:501
+msgid "The candidates are:"
+msgstr "Возможно, вы имели в виду:"
-#: builtin/am.c:1889
+#: sha1-name.c:800
msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
-msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: submodule.c:118 submodule.c:147
#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Не удалось разобрать объект «%s»."
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
-#: builtin/am.c:2048
-msgid "failed to clean index"
-msgstr "не удалось очистить индекс"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Не удалось удалить запись в .gitmodules для %s"
-#: builtin/am.c:2083
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "сбой индексирования обновленного .gitmodules"
-#: builtin/am.c:2174
+#: submodule.c:327
#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "Ð\9dепÑ\80авилÑ\8cное знаÑ\87ение длÑ\8f --patch-format: %s"
+msgid "in unpopulated submodule '%s'"
+msgstr "в пÑ\83Ñ\81Ñ\82ом подмодÑ\83ле «%s»"
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<опции>] (--continue | --skip | --abort)"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
-#: builtin/am.c:2217
-msgid "run interactively"
-msgstr "запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c в инÑ\82еÑ\80акÑ\82ивном Ñ\80ежиме"
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c опÑ\80еделиÑ\82Ñ\8c HEAD как дейÑ\81Ñ\82виÑ\82елÑ\8cнÑ\83Ñ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83."
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
-msgstr "историческая опция — ничего не делает"
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
-msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
+#: submodule.c:1651
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "«%s» не распознан как репозиторий git"
-#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
-#: builtin/repack.c:299
-msgid "be quiet"
-msgstr "тихий режим"
+#: submodule.c:1789
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добавить строку Signed-off-by к сообщению коммита"
+#: submodule.c:1802
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
-msgstr "перекодировать в utf8 (по умолчанию)"
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
-msgstr "передать флаг -k в git-mailinfo"
+#: submodule.c:1907
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "подмодуль «%s» имеет изменённый индекс"
-#: builtin/am.c:2231
-msgid "pass -b flag to git-mailinfo"
-msgstr "передать флаг -b в git-mailinfo"
+#: submodule.c:1959
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr ""
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
-msgstr "передать флаг -m в git-mailinfo"
+#: submodule.c:2008
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
+#: submodule.c:2020 submodule.c:2076
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "не удалось запросить имя подмодуля «%s»"
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
+#: submodule.c:2027
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
-msgstr "обрезать все до строки обрезки"
+#: submodule.c:2111
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
-#: builtin/am.c:2243 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:2270
-msgid "pass it through git-apply"
-msgstr "передать его в git-apply"
+#: submodule.c:2155
+msgid "could not start ls-files in .."
+msgstr "не удалось выполнить stat ls-files в .."
-#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
-#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
-#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144
-#: parse-options.h:146 parse-options.h:258
-msgid "n"
-msgstr "n"
+#: submodule.c:2194
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree вернул неожиданный код %d"
-#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
-msgid "format"
-msgstr "формат"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "игнорирую подозрительный подмодуль с именем: %s"
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
-msgstr "формат, в котором находятся патчи"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs"
-#: builtin/am.c:2273
-msgid "override error message when patch failure occurs"
-msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
-msgstr "продолжить применение изменений после разрешения конфиликта"
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
+msgstr "неправильное значение %s"
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
-msgstr "синоним для --continue"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr " Не удалось обновить .gitmodules запись %s"
-#: builtin/am.c:2281
-msgid "skip the current patch"
-msgstr "пропустить текущий патч"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "сбой при запуске команды завершителя «%s»"
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
-msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "неизвестное значение «%s» для ключа «%s»"
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr ""
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
+msgstr "больше одного %s"
-#: builtin/am.c:2290
-msgid "show the patch being applied."
-msgstr ""
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "пустая последняя лексема в завершителе «%.*s»"
-#: builtin/am.c:2294
-msgid "lie about committer date"
-msgstr "соврать о дате коммитера"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "не удалось прочитать входной файл «%s»"
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ее вÑ\80емÑ\8f как вÑ\80емÑ\8f авÑ\82оÑ\80Ñ\81Ñ\82ва"
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
-#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400
-msgid "key-id"
-msgstr "key-id"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
+msgstr "не удалось выполнить stat для %s"
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
-msgstr "подписать коммиты с помощью GPG"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "файл %s не является обычным файлом"
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
-msgstr "(внутреннее использование для git-rebase)"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "файл %s не доступен на запись пользователю"
-#: builtin/am.c:2320
-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. Пожалуйста, не используйте ее."
+#: trailer.c:1027
+msgid "could not open temporary file"
+msgstr "не удалось создать временный файл"
-#: builtin/am.c:2327
-msgid "failed to read the index"
-msgstr "сбой чтения индекса"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "не удалось переименовать временный файл в %s"
-#: builtin/am.c:2342
+#: transport.c:116
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
-msgstr "пÑ\80едÑ\8bдÑ\83Ñ\89ий каÑ\82алог пеÑ\80емеÑ\89ениÑ\8f %s еÑ\89е Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82, но пеÑ\80едан mbox."
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Ð\91Ñ\83деÑ\82 Ñ\83Ñ\81Ñ\82ановлен вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ий Ñ\80епозиÑ\82оÑ\80ий длÑ\8f «%s» на «%s» Ñ\81 «%s»\n"
-#: builtin/am.c:2366
+#: transport.c:142
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
+msgid "could not read bundle '%s'"
+msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "транспорт: неправильный параметр глубины «%s»"
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<опции>] [<патч>…]"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "не удалось создать файл архива «%s»"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
+msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
-msgstr "не удалось перенаправить вывод"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
+msgstr "не удалось разобрать опцию transport.color.*"
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
-msgstr "git archive: внешний репозиторий без URL"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr "git archive: ожидается ACK/NAK, получен пакет сброса буфера"
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
-#: builtin/archive.c:61
+#: transport.c:891
#, c-format
-msgid "git archive: NACK %s"
-msgstr "git archive: NACK %s"
+msgid "transport '%s' not allowed"
+msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
-msgstr "git archive: ошибка протокола"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
+msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
-msgstr "git archive: ожидался сброс буфера"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+#: transport.c:1044
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
+#: transport.c:1052
+msgid "Aborting."
+msgstr "Прерываю."
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
+msgstr ""
-#: builtin/bisect--helper.c:46
-#, c-format
-msgid "'%s' is not a valid term"
-msgstr "«%s» не является допустимым определением"
+#: transport.c:1326 transport-helper.c:645
+msgid "operation not supported by protocol"
+msgstr ""
-#: builtin/bisect--helper.c:50
+#: transport.c:1430
#, c-format
-msgid "can't use the builtin command '%s' as a term"
-msgstr "нельзя использовать встроенную команду «%s» как определение"
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr ""
-#: builtin/bisect--helper.c:60
+#: transport-helper.c:134
#, c-format
-msgid "can't change the meaning of the term '%s'"
-msgstr "нельзя изменить значение определения «%s»"
+msgid "unable to find remote helper for '%s'"
+msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
-msgstr "используйте два разных определения"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
+msgstr ""
-#: builtin/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
-msgstr "не удалось открыть файл BISECT_TERMS"
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
-msgstr "выполнить «git bisect next»"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
+msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "записать определения в .git/BISECT_TERMS"
+#: transport-helper.c:274 transport-helper.c:414
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
-msgstr "очистить состояние двоичного поиска"
+#: transport-helper.c:403
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
-msgstr "проверить ожидаемые редакции"
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
+msgstr ""
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
+#: transport-helper.c:504
+msgid "error while running fast-import"
+msgstr ""
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms требует указания двух параметров"
+#: transport-helper.c:533 transport-helper.c:1099
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state не требует указания параметров"
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
+msgstr ""
-#: builtin/blame.c:36
-msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<опции-rev-list> документированы в git-rev-list(1)"
+#: transport-helper.c:602
+msgid "invalid remote service path"
+msgstr ""
-#: builtin/blame.c:406
+#: transport-helper.c:648
#, c-format
-msgid "expecting a color: %s"
-msgstr "ожидается цвет: %s"
+msgid "can't connect to subservice %s"
+msgstr ""
-#: builtin/blame.c:413
-msgid "must end with a color"
-msgstr "должно заканчиваться на цвет"
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
-#: builtin/blame.c:700
+#: transport-helper.c:773
#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/blame.c:718
-msgid "invalid value for blame.coloring"
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/blame.c:789
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Показать записи авторства постепенно, в процессе нахождения"
-
-#: builtin/blame.c:790
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
-
-#: builtin/blame.c:791
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
-
-#: builtin/blame.c:792
-msgid "Show work cost statistics"
-msgstr "Показать статистику расходов на выполнение запроса"
-
-#: builtin/blame.c:793
-msgid "Force progress reporting"
-msgstr "Принудительно выводить прогресс выполнения"
-
-#: builtin/blame.c:794
-msgid "Show output score for blame entries"
-msgstr "Показать оценку для записей авторства"
-
-#: builtin/blame.c:795
-msgid "Show original filename (Default: auto)"
-msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
-
-#: builtin/blame.c:796
-msgid "Show original linenumber (Default: off)"
-msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
-
-#: builtin/blame.c:797
-msgid "Show in a format designed for machine consumption"
-msgstr "Показать в формате для программного разбора"
-
-#: builtin/blame.c:798
-msgid "Show porcelain format with per-line commit information"
-msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
-
-#: builtin/blame.c:799
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-
-#: builtin/blame.c:800
-msgid "Show raw timestamp (Default: off)"
-msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-
-#: builtin/blame.c:801
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-
-#: builtin/blame.c:802
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
-
-#: builtin/blame.c:803
-msgid "Show author email instead of name (Default: off)"
-msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
-
-#: builtin/blame.c:804
-msgid "Ignore whitespace differences"
-msgstr "Игнорировать различия в пробелах"
-
-#: builtin/blame.c:805
-msgid "color redundant metadata from previous line differently"
+#: transport-helper.c:837
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/blame.c:806
-msgid "color lines by age"
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/blame.c:813
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы различий"
-
-#: builtin/blame.c:815
-msgid "Spend extra cycles to find better match"
-msgstr "Потратить больше времени, для нахождения лучших совпадений"
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
-#: builtin/blame.c:816
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
+#: transport-helper.c:939
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
-#: builtin/blame.c:817
-msgid "Use <file>'s contents as the final image"
-msgstr "Использовать содержимое <файла> как финальный снимок"
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
-#: builtin/blame.c:818 builtin/blame.c:819
-msgid "score"
-msgstr "мин-длина"
+#: transport-helper.c:991
+msgid "couldn't run fast-export"
+msgstr ""
-#: builtin/blame.c:818
-msgid "Find line copies within and across files"
-msgstr "Найти копирование строк в пределах и между файлами"
+#: transport-helper.c:996
+msgid "error while running fast-export"
+msgstr ""
-#: builtin/blame.c:819
-msgid "Find line movements within and across files"
-msgstr "Найти перемещения строк в пределах и между файлами"
+#: transport-helper.c:1021
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
-#: builtin/blame.c:820
-msgid "n,m"
-msgstr "начало,конец"
+#: transport-helper.c:1085
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
-#: builtin/blame.c:820
-msgid "Process only line range n,m, counting from 1"
-msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
+#: transport-helper.c:1238
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
-#: builtin/blame.c:869
-msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
+#: transport-helper.c:1265
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
-#. 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:920
-msgid "4 years, 11 months ago"
-msgstr "4 года и 11 месяцев назад"
+#: transport-helper.c:1314
+#, c-format
+msgid "%s thread failed"
+msgstr ""
-#: builtin/blame.c:1007
+#: transport-helper.c:1318
#, 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 строки"
-msgstr[2] "файл %s содержит только %lu строк"
-msgstr[3] "файл %s содержит только %lu строки"
+msgid "%s thread failed to join: %s"
+msgstr ""
-#: builtin/blame.c:1053
-msgid "Blaming lines"
-msgstr "Просмотр авторов строк"
+#: transport-helper.c:1337 transport-helper.c:1341
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
+#: transport-helper.c:1378
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]"
+#: transport-helper.c:1382
+#, c-format
+msgid "%s process failed"
+msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…"
+#: transport-helper.c:1400 transport-helper.c:1409
+msgid "can't start thread for copying data"
+msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "слишком короткий объект дерева"
-#: builtin/branch.c:32
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "неправильный режим в записи дерева"
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr "git branch [<опции>] [-r | -a] [--points-at]"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "пустое имя файла в записи дерева"
-#: builtin/branch.c:34
-msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr "git branch [<опции>] [-r | -a] [--format]"
+#: tree-walk.c:116
+msgid "too-short tree file"
+msgstr "слишком короткий файл дерева"
-#: builtin/branch.c:143
+#: unpack-trees.c:111
#, c-format
msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
-msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD."
+"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Сделайте коммит или спрячьте ваши изменения перед переключением веток."
-#: builtin/branch.c:147
+#: unpack-trees.c:113
#, c-format
msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
-msgstr "не Ñ\83даление веÑ\82ки «%s», коÑ\82оÑ\80аÑ\8f еÑ\89е не Ñ\81лиÑ\82а Ñ\81\n «%s», Ñ\85оÑ\82Ñ\8f Ñ\83же Ñ\81лиÑ\82а Ñ\81 HEAD."
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Ð\92аÑ\88и локалÑ\8cнÑ\8bе изменениÑ\8f в Ñ\83казаннÑ\8bÑ\85 Ñ\84айлаÑ\85 бÑ\83дÑ\83Ñ\82 пеÑ\80езапиÑ\81анÑ\8b пÑ\80и пеÑ\80еклÑ\8eÑ\87ении на Ñ\81оÑ\81Ñ\82оÑ\8fние:\n%%s"
-#: builtin/branch.c:161
+#: unpack-trees.c:116
#, c-format
-msgid "Couldn't look up commit object for '%s'"
-msgstr "Не удалось найти объект коммита для «%s»"
+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Сделайте коммит или спрячьте ваши изменения перед слиянием веток."
-#: builtin/branch.c:165
+#: unpack-trees.c:118
#, 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:178
-msgid "Update of config-file failed"
-msgstr "Не удалось обновить файл конфигурации"
-
-#: builtin/branch.c:209
-msgid "cannot use -a with -d"
-msgstr "нельзя использовать одновременно ключи -a и -d"
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
-#: builtin/branch.c:215
-msgid "Couldn't look up commit object for HEAD"
-msgstr "Не удалось найти объект коммита для HEAD"
+#: unpack-trees.c:121
+#, 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."
-#: builtin/branch.c:229
+#: unpack-trees.c:123
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
-#: builtin/branch.c:244
+#: unpack-trees.c:128
#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr "внешняя отслеживаемая ветка «%s» не найдена."
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
-#: builtin/branch.c:245
+#: unpack-trees.c:132
#, c-format
-msgid "branch '%s' not found."
-msgstr "ветка «%s» не найдена."
+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Переместите эти файлы или удалите их перед переключением веток."
-#: builtin/branch.c:260
+#: unpack-trees.c:134
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
-#: builtin/branch.c:261
+#: unpack-trees.c:137
#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Ошибка удаления ветки «%s»"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: builtin/branch.c:268
+#: unpack-trees.c:139
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
-msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
-#: builtin/branch.c:269
+#: unpack-trees.c:142
#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr "Ветка %s удалена (была %s).\n"
-
-#: builtin/branch.c:413 builtin/tag.c:59
-msgid "unable to parse format string"
-msgstr "не удалось разобрать строку формата"
+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."
-#: builtin/branch.c:450
+#: unpack-trees.c:144
#, c-format
-msgid "Branch %s is being rebased at %s"
-msgstr "Производится перемещение ветки %s на %s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
-#: builtin/branch.c:454
+#: unpack-trees.c:150
#, c-format
-msgid "Branch %s is being bisected at %s"
-msgstr "Производится двоичный поиск в ветке %s на %s"
-
-#: builtin/branch.c:471
-msgid "cannot copy the current branch while not on any."
-msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток."
+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Переместите эти файлы или удалите их перед переключением веток."
-#: builtin/branch.c:473
-msgid "cannot rename the current branch while not on any."
-msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by checkout:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
-#: builtin/branch.c:484
+#: unpack-trees.c:155
#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr "Недействительное имя ветки: «%s»"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: builtin/branch.c:511
-msgid "Branch rename failed"
-msgstr "Сбой переименования ветки"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
-#: builtin/branch.c:513
-msgid "Branch copy failed"
-msgstr "Сбой копирования ветки"
+#: unpack-trees.c:160
+#, 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."
-#: builtin/branch.c:517
+#: unpack-trees.c:162
#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
-msgstr "Создана копия неправильно названной ветки «%s»"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
-#: builtin/branch.c:520
+#: unpack-trees.c:170
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
-msgstr "Ð\9fеÑ\80еименована непÑ\80авилÑ\8cно названнаÑ\8f веÑ\82ка «%s»"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Ð\97апиÑ\81Ñ\8c «%s» Ñ\87аÑ\81Ñ\82иÑ\87но Ñ\81овпадаеÑ\82 Ñ\81 «%s». Ð\9dе Ñ\83далоÑ\81Ñ\8c назнаÑ\87иÑ\82Ñ\8c Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вие."
-#: builtin/branch.c:526
+#: unpack-trees.c:173
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "Ветка переименована в %s, но HEAD не обновлен!"
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
-#: builtin/branch.c:535
-msgid "Branch is renamed, but update of config-file failed"
-msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
-#: builtin/branch.c:537
-msgid "Branch is copied, but update of config-file failed"
-msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout update:\n"
+"%s"
+msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
-#: builtin/branch.c:553
+#: unpack-trees.c:179
#, c-format
msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
-msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
+"Cannot update submodule:\n"
+"%s"
+msgstr "Не удолось обновить подмодуль:\n%s"
-#: builtin/branch.c:594
-msgid "Generic options"
-msgstr "Общие параметры"
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
+msgstr "Прерываю\n"
-#: builtin/branch.c:596
-msgid "show hash and subject, give twice for upstream branch"
-msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\85Ñ\8dÑ\88-Ñ\81Ñ\83ммÑ\83 и Ñ\82емÑ\83, Ñ\83кажиÑ\82е дваждÑ\8b длÑ\8f вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ки"
+#: unpack-trees.c:318
+msgid "Checking out files"
+msgstr "РаÑ\81паковка Ñ\84айлов"
-#: builtin/branch.c:597
-msgid "suppress informational messages"
-msgstr "не выводить информационные сообщения"
+#: unpack-trees.c:350
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
-#: builtin/branch.c:598
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
-#: builtin/branch.c:600
-msgid "do not use"
-msgstr "не используйте"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "неправильная управляющая последовательность %XX"
-#: builtin/branch.c:602
-msgid "upstream"
-msgstr "вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89аÑ\8f"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "пÑ\80опÑ\83Ñ\89ено имÑ\8f Ñ\81еÑ\80веÑ\80а и Ñ\81Ñ\85ема доÑ\81Ñ\82Ñ\83па не «file:»"
-#: builtin/branch.c:602
-msgid "change the upstream info"
-msgstr "изменить информацию о вышестоящей ветке"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "URL со схемой «file:» не может содержать номер порта"
-#: builtin/branch.c:603
-msgid "Unset the upstream info"
-msgstr "УбÑ\80аÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ке"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "непÑ\80авилÑ\8cнÑ\8bе Ñ\81имволÑ\8b в имени Ñ\81еÑ\80веÑ\80а"
-#: builtin/branch.c:604
-msgid "use colored output"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\86веÑ\82ной вÑ\8bвод"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "непÑ\80авилÑ\8cнÑ\8bй номеÑ\80 поÑ\80Ñ\82а"
-#: builtin/branch.c:605
-msgid "act on remote-tracking branches"
-msgstr "вÑ\8bполниÑ\82Ñ\8c дейÑ\81Ñ\82виÑ\8f на оÑ\82Ñ\81леживаемÑ\8bÑ\85 внеÑ\88ниÑ\85 веÑ\82каÑ\85"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\87аÑ\81Ñ\82Ñ\8c пÑ\83Ñ\82и «..»"
-#: builtin/branch.c:607 builtin/branch.c:609
-msgid "print only branches that contain the commit"
-msgstr "вывод только веток, которые содержат коммит"
+#: worktree.c:255 builtin/am.c:2097
+#, c-format
+msgid "failed to read '%s'"
+msgstr "не удалось прочитать «%s»"
-#: builtin/branch.c:608 builtin/branch.c:610
-msgid "print only branches that don't contain the commit"
-msgstr "вывод только веток, которые не содержат коммит"
+#: worktree.c:301
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
-#: builtin/branch.c:613
-msgid "Specific git-branch actions:"
-msgstr "Специфичные для git-branch действия:"
+#: worktree.c:312
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
-#: builtin/branch.c:614
-msgid "list both remote-tracking and local branches"
-msgstr "показать список и отслеживаемых и локальных веток"
+#: worktree.c:324
+#, c-format
+msgid "'%s' does not exist"
+msgstr "«%s» не существует"
-#: builtin/branch.c:616
-msgid "delete fully merged branch"
-msgstr "удалить полностью слитую ветку"
+#: worktree.c:330
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
-#: builtin/branch.c:617
-msgid "delete branch (even if not merged)"
-msgstr "удалить ветку (даже никуда не слитую)"
+#: worktree.c:338
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
-#: builtin/branch.c:618
-msgid "move/rename a branch and its reflog"
-msgstr "переместить/переименовать ветки и ее журнал ссылок"
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "не удалось открыть «%s» для чтения и записи"
-#: builtin/branch.c:619
-msgid "move/rename a branch, even if target exists"
-msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr "«%s» недоступно"
-#: builtin/branch.c:620
-msgid "copy a branch and its reflog"
-msgstr "скопировать ветку и её журнал ссылок"
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr "не удалось получить текущий рабочий каталог"
-#: builtin/branch.c:621
-msgid "copy a branch, even if target exists"
-msgstr "скопировать ветку, даже если целевое имя уже существует"
+#: wt-status.c:156
+msgid "Unmerged paths:"
+msgstr "Не слитые пути:"
-#: builtin/branch.c:622
-msgid "list branch names"
-msgstr "показать список имен веток"
+#: wt-status.c:183 wt-status.c:210
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
-#: builtin/branch.c:623
-msgid "create the branch's reflog"
-msgstr "создать журнал ссылок ветки"
+#: wt-status.c:185 wt-status.c:212
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
-#: builtin/branch.c:626
-msgid "deprecated synonym for --create-reflog"
-msgstr ""
+#: wt-status.c:189
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: builtin/branch.c:631
-msgid "edit the description for the branch"
-msgstr "изменить описание ветки"
+#: wt-status.c:191 wt-status.c:195
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-#: builtin/branch.c:632
-msgid "force creation, move/rename, deletion"
-msgstr "принудительное создание, перемещение или удаление ветки"
+#: wt-status.c:193
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: builtin/branch.c:633
-msgid "print only branches that are merged"
-msgstr "вÑ\8bвод Ñ\82олÑ\8cко Ñ\81лиÑ\82Ñ\8bÑ\85 веÑ\82ок"
+#: wt-status.c:204 wt-status.c:1064
+msgid "Changes to be committed:"
+msgstr "Ð\98зменениÑ\8f, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 вклÑ\8eÑ\87енÑ\8b в коммиÑ\82:"
-#: builtin/branch.c:634
-msgid "print only branches that are not merged"
-msgstr "вÑ\8bвод Ñ\82олÑ\8cко не Ñ\81лиÑ\82Ñ\8bÑ\85 веÑ\82ок"
+#: wt-status.c:222 wt-status.c:1073
+msgid "Changes not staged for commit:"
+msgstr "Ð\98зменениÑ\8f, коÑ\82оÑ\80Ñ\8bе не в индекÑ\81е длÑ\8f коммиÑ\82а:"
-#: builtin/branch.c:635
-msgid "list branches in columns"
-msgstr "показать список веток по столбцам"
+#: wt-status.c:226
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:413
-msgid "key"
-msgstr "ключ"
+#: wt-status.c:228
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:414
-msgid "field name to sort on"
-msgstr "имя поля, по которому выполнить сортировку"
+#: wt-status.c:229
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working "
+"directory)"
+msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
-#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410
-#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
-#: builtin/tag.c:416
-msgid "object"
-msgstr "объект"
+#: wt-status.c:231
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-#: builtin/branch.c:640
-msgid "print only branches of the object"
-msgstr "вывод только веток, определенного объекта"
+#: wt-status.c:243
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
-msgid "sorting and filtering are case insensitive"
-msgstr "сортировка и фильтрация не зависят от регистра"
-
-#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
-msgstr "использовать формат для вывода"
-
-#: builtin/branch.c:666 builtin/clone.c:739
-msgid "HEAD not found below refs/heads!"
-msgstr "HEAD не найден в refs/heads!"
+#: wt-status.c:258
+msgid "both deleted:"
+msgstr "оба удалены:"
-#: builtin/branch.c:689
-msgid "--column and --verbose are incompatible"
-msgstr "--column и --verbose нельзя использовать одновременно"
+#: wt-status.c:260
+msgid "added by us:"
+msgstr "добавлено нами:"
-#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
-msgid "branch name required"
-msgstr "Ñ\82Ñ\80ебÑ\83еÑ\82Ñ\81Ñ\8f имÑ\8f веÑ\82ки"
+#: wt-status.c:262
+msgid "deleted by them:"
+msgstr "Ñ\83далено ими:"
-#: builtin/branch.c:737
-msgid "Cannot give description to detached HEAD"
-msgstr "Ð\9dелÑ\8cзÑ\8f даÑ\82Ñ\8c опиÑ\81ание оÑ\82делÑ\91нномÑ\83 HEAD"
+#: wt-status.c:264
+msgid "added by them:"
+msgstr "добавлено ими:"
-#: builtin/branch.c:742
-msgid "cannot edit description of more than one branch"
-msgstr "нельзя изменить описание более одной ветки за раз"
+#: wt-status.c:266
+msgid "deleted by us:"
+msgstr "удалено нами:"
-#: builtin/branch.c:749
-#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr "Еще нет коммита на ветке «%s»."
+#: wt-status.c:268
+msgid "both added:"
+msgstr "оба добавлены:"
-#: builtin/branch.c:752
-#, c-format
-msgid "No branch named '%s'."
-msgstr "Нет ветки с именем «%s»."
+#: wt-status.c:270
+msgid "both modified:"
+msgstr "оба изменены:"
-#: builtin/branch.c:767
-msgid "too many branches for a copy operation"
-msgstr "слишком много веток для операции копирования"
+#: wt-status.c:280
+msgid "new file:"
+msgstr "новый файл:"
-#: builtin/branch.c:776
-msgid "too many arguments for a rename operation"
-msgstr "Ñ\81лиÑ\88ком много аÑ\80гÑ\83менÑ\82ов длÑ\8f опеÑ\80аÑ\86ии пеÑ\80еименованиÑ\8f"
+#: wt-status.c:282
+msgid "copied:"
+msgstr "Ñ\81копиÑ\80овано:"
-#: builtin/branch.c:781
-msgid "too many arguments to set new upstream"
-msgstr "Ñ\81лиÑ\88ком много аÑ\80гÑ\83менÑ\82ов длÑ\8f Ñ\83казаниÑ\8f новой вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ки"
+#: wt-status.c:284
+msgid "deleted:"
+msgstr "Ñ\83далено:"
-#: builtin/branch.c:785
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
+#: wt-status.c:286
+msgid "modified:"
+msgstr "изменено:"
-#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
-#, c-format
-msgid "no such branch '%s'"
-msgstr "нет такой ветки «%s»"
+#: wt-status.c:288
+msgid "renamed:"
+msgstr "переименовано:"
-#: builtin/branch.c:792
-#, c-format
-msgid "branch '%s' does not exist"
-msgstr "ветка «%s» не существует"
+#: wt-status.c:290
+msgid "typechange:"
+msgstr "изменен тип:"
-#: builtin/branch.c:804
-msgid "too many arguments to unset upstream"
-msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
+#: wt-status.c:292
+msgid "unknown:"
+msgstr "неизвестно:"
-#: builtin/branch.c:808
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
+#: wt-status.c:294
+msgid "unmerged:"
+msgstr "не слитые:"
-#: builtin/branch.c:814
-#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
+#: wt-status.c:374
+msgid "new commits, "
+msgstr "новые коммиты, "
-#: builtin/branch.c:829
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "паÑ\80амеÑ\82Ñ\80Ñ\8b -a и -r длÑ\8f «git branch» не имеÑ\8eÑ\82 Ñ\81мÑ\8bÑ\81ла Ñ\81 Ñ\83казанием имени веÑ\82ки"
+#: wt-status.c:376
+msgid "modified content, "
+msgstr "изменено Ñ\81одеÑ\80жимое, "
-#: builtin/branch.c:832
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
-msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»"
+#: wt-status.c:378
+msgid "untracked content, "
+msgstr "неотслеживаемое содержимое, "
-#: builtin/bundle.c:45
+#: wt-status.c:896
#, c-format
-msgid "%s is okay\n"
-msgstr "%s в порядке\n"
+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 записи"
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
-msgstr "ТÑ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ий длÑ\8f Ñ\81озданиÑ\8f пакеÑ\82а."
+#: wt-status.c:928
+msgid "Submodules changed but not updated:"
+msgstr "Ð\98змененнÑ\8bе, но не обновленнÑ\8bе подмодÑ\83ли:"
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
-msgstr "ТÑ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ий длÑ\8f Ñ\80аÑ\81паковки."
+#: wt-status.c:930
+msgid "Submodule changes to be committed:"
+msgstr "Ð\98зменениÑ\8f в подмодÑ\83лÑ\8fÑ\85, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 закоммиÑ\87енÑ\8b:"
-#: builtin/cat-file.c:577
+#: wt-status.c:1012
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=<путь>] <объект>"
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано."
-#: builtin/cat-file.c:578
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
-"--filters]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
+#: wt-status.c:1119
+msgid "You have unmerged paths."
+msgstr "У вас есть не слитые пути."
-#: builtin/cat-file.c:615
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<тип> может быть одним из: blob, tree, commit, tag"
+#: wt-status.c:1122
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (разрешите конфликты, затем запустите «git commit»)"
-#: builtin/cat-file.c:616
-msgid "show object type"
-msgstr "показать тип объекта"
+#: wt-status.c:1124
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
-#: builtin/cat-file.c:617
-msgid "show object size"
-msgstr "показаÑ\82Ñ\8c Ñ\80азмеÑ\80 обÑ\8aекÑ\82а"
+#: wt-status.c:1128
+msgid "All conflicts fixed but you are still merging."
+msgstr "Ð\92Ñ\81е конÑ\84ликÑ\82Ñ\8b иÑ\81пÑ\80авленÑ\8b, но вÑ\8b вÑ\81е еÑ\89е в пÑ\80оÑ\86еÑ\81Ñ\81е Ñ\81лиÑ\8fниÑ\8f."
-#: builtin/cat-file.c:619
-msgid "exit with zero when there's no error"
-msgstr "выйти с нулевым кодом возврата, если нет ошибки"
+#: wt-status.c:1131
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (используйте «git commit», чтобы завершить слияние)"
-#: builtin/cat-file.c:620
-msgid "pretty-print object's content"
-msgstr "структурированный вывод содержимого объекта"
+#: wt-status.c:1140
+msgid "You are in the middle of an am session."
+msgstr "Вы в процессе сессии am."
-#: builtin/cat-file.c:622
-msgid "for blob objects, run textconv on object's content"
-msgstr "запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c texconv на Ñ\81одеÑ\80жимом двоиÑ\87нÑ\8bÑ\85 обÑ\8aекÑ\82ов "
+#: wt-status.c:1143
+msgid "The current patch is empty."
+msgstr "ТекÑ\83Ñ\89ий паÑ\82Ñ\87 пÑ\83Ñ\81Ñ\82ой."
-#: builtin/cat-file.c:624
-msgid "for blob objects, run filters on object's content"
-msgstr "запуск фильтров на содержимом двоичных объектов "
+#: wt-status.c:1147
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
-#: builtin/cat-file.c:625 git-submodule.sh:864
-msgid "blob"
-msgstr "двоичный объект"
+#: wt-status.c:1149
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
-#: builtin/cat-file.c:626
-msgid "use a specific path for --textconv/--filters"
-msgstr "использовать определенный путь для --textconv/--filters"
+#: wt-status.c:1151
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-#: builtin/cat-file.c:628
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "разрешить -s и -t работать с повреждёнными объектами"
+#: wt-status.c:1284
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo отсутствует."
-#: builtin/cat-file.c:629
-msgid "buffer --batch output"
-msgstr "бÑ\83Ñ\84Ñ\84еÑ\80иÑ\80оваÑ\82Ñ\8c вÑ\8bвод --batch"
+#: wt-status.c:1286
+msgid "No commands done."
+msgstr "Ð\9aомандÑ\8b не вÑ\8bполненÑ\8b."
-#: builtin/cat-file.c:631
-msgid "show info and content of objects fed from the standard input"
-msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
+#: wt-status.c:1289
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Последняя команда выполнена (%d команда выполнена):"
+msgstr[1] "Последняя команда выполнена (%d команды выполнено):"
+msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
+msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
-#: builtin/cat-file.c:634
-msgid "show info about objects fed from the standard input"
-msgstr "показать информацию об объектах, переданных из стандартного ввода"
+#: wt-status.c:1300
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (смотрите дополнительно в файле %s)"
-#: builtin/cat-file.c:637
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "пеÑ\80еÑ\85одиÑ\82Ñ\8c по Ñ\81имволÑ\8cнÑ\8bм Ñ\81Ñ\81Ñ\8bлкам внÑ\83Ñ\82Ñ\80и деÑ\80ева (иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f Ñ\81 опÑ\86иÑ\8fми --batch и --batch-check)"
+#: wt-status.c:1305
+msgid "No commands remaining."
+msgstr "Ð\9aоманд болÑ\8cÑ\88е не оÑ\81Ñ\82алоÑ\81Ñ\8c."
-#: builtin/cat-file.c:639
-msgid "show all objects with --batch or --batch-check"
-msgstr "показать все объекты с опциями --batch или --batch-check"
+#: wt-status.c:1308
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Следующая команда для выполнения (%d команда осталась):"
+msgstr[1] "Следующая команда для выполнения (%d команды осталось):"
+msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
+msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
-#: builtin/cat-file.c:641
-msgid "do not order --batch-all-objects output"
-msgstr ""
+#: wt-status.c:1316
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
+#: wt-status.c:1328
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
+#: wt-status.c:1333
+msgid "You are currently rebasing."
+msgstr "Вы сейчас перемещаете ветку."
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
-msgstr "вывести все атрибуты установленные для файла"
+#: wt-status.c:1346
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
-msgstr "использовать только .gitattributes из индекса"
+#: wt-status.c:1348
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
-msgid "read file names from stdin"
-msgstr "прочитать имена файлов из стандартного ввода"
+#: wt-status.c:1350
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
-msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
+#: wt-status.c:1357
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
-msgid "suppress progress reporting"
-msgstr "не выводить прогресс выполнения"
+#: wt-status.c:1361
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
-msgstr "показаÑ\82Ñ\8c не Ñ\81овпадаÑ\8eÑ\89ие введеннÑ\8bе пÑ\83Ñ\82и"
+#: wt-status.c:1366
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 Ñ\80азделÑ\8fеÑ\82е коммиÑ\82 пÑ\80и пеÑ\80емеÑ\89ении веÑ\82ки."
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
-msgstr "игнорировать индекс при проверке"
+#: wt-status.c:1369
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
-msgstr "нельзя указывать пути вместе с параметром --stdin"
+#: wt-status.c:1373
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»."
-#: builtin/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
-msgstr "-z имеет смысл только вместе с параметром --stdin"
+#: wt-status.c:1378
+msgid "You are currently editing a commit during a rebase."
+msgstr "Вы сейчас редактируете коммит при перемещении ветки."
-#: builtin/check-ignore.c:164
-msgid "no path specified"
-msgstr "не указан путь"
+#: wt-status.c:1381
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
-msgstr "--quiet можно использовать только при указании одного пути"
+#: wt-status.c:1383
+msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
-msgstr "нельзя использовать одновременно --quiet и --verbose"
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
+msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
-msgstr "--non-matching можно использовать только вместе с --verbose"
+#: wt-status.c:1397
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Вы копируете коммит %s."
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<опции>] <контакт>…"
+#: wt-status.c:1404
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
-msgstr "также читать контакты из стандартного ввода"
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr ""
-#: builtin/check-mailmap.c:25
+#: wt-status.c:1410
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
+
+#: wt-status.c:1412
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
+
+#: wt-status.c:1422
+msgid "Revert currently in progress."
+msgstr ""
+
+#: wt-status.c:1425
#, c-format
-msgid "unable to parse contact: %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c конÑ\82акÑ\82: %s"
+msgid "You are currently reverting commit %s."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 обÑ\80аÑ\89аеÑ\82е изменениÑ\8f коммиÑ\82а %s."
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
-msgstr "не указаны контакты"
+#: wt-status.c:1431
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<опции>] [--] [<файл>…]"
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
+msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
-msgstr "индекс должен быть между 1 и 3 или all"
+#: wt-status.c:1437
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
-msgstr "переключиться на состояние всех файлов из индекса"
+#: wt-status.c:1439
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
-msgstr "принудительная перезапись существующих файлов"
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
-msgstr "не вÑ\8bводиÑ\82Ñ\8c пÑ\80едÑ\83пÑ\80еждениÑ\8f длÑ\8f Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89иÑ\85 и непÑ\80оиндекÑ\81иÑ\80ованнÑ\8bÑ\85 Ñ\84айлов"
+#: wt-status.c:1453
+msgid "You are currently bisecting."
+msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 в пÑ\80оÑ\86еÑ\81Ñ\81е двоиÑ\87ного поиÑ\81ка."
-#: builtin/checkout-index.c:164
-msgid "don't checkout new files"
-msgstr "не создавать новые файлы"
+#: wt-status.c:1456
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
-msgstr "обновиÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 доÑ\81Ñ\82Ñ\83па в Ñ\84айле индекÑ\81а"
+#: wt-status.c:1665
+msgid "On branch "
+msgstr "Ð\9dа веÑ\82ке "
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
-msgstr "пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\81пиÑ\81ок пÑ\83Ñ\82ей из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
+#: wt-status.c:1672
+msgid "interactive rebase in progress; onto "
+msgstr "инÑ\82еÑ\80акÑ\82ивное пеÑ\80емеÑ\89ение в пÑ\80оÑ\86еÑ\81Ñ\81е; над "
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
-msgstr "запиÑ\81аÑ\82Ñ\8c Ñ\81одеÑ\80жимое во вÑ\80еменнÑ\8bе Ñ\84айлÑ\8b"
+#: wt-status.c:1674
+msgid "rebase in progress; onto "
+msgstr "пеÑ\80емеÑ\89ение в пÑ\80оÑ\86еÑ\81Ñ\81е; над "
-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
-#: builtin/worktree.c:610
-msgid "string"
-msgstr "строка"
+#: wt-status.c:1679
+msgid "HEAD detached at "
+msgstr "HEAD отделён на "
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
-msgstr "добавить спереди <строку> при создании файлов"
+#: wt-status.c:1681
+msgid "HEAD detached from "
+msgstr "HEAD отделён начиная с "
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
-msgstr "копиÑ\80оваÑ\82Ñ\8c Ñ\84айлÑ\8b из Ñ\83казанного индекÑ\81а"
+#: wt-status.c:1684
+msgid "Not currently on any branch."
+msgstr "СейÑ\87аÑ\81 ни на одной из веÑ\82ок"
-#: builtin/checkout.c:29
-msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<опции>] <ветка>"
+#: wt-status.c:1701
+msgid "Initial commit"
+msgstr "Начальный коммит"
-#: builtin/checkout.c:30
-msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
+#: wt-status.c:1702
+msgid "No commits yet"
+msgstr "Еще нет коммитов"
+
+#: wt-status.c:1716
+msgid "Untracked files"
+msgstr "Неотслеживаемые файлы"
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: wt-status.c:1718
+msgid "Ignored files"
+msgstr "Игнорируемые файлы"
+
+#: wt-status.c:1722
#, c-format
-msgid "path '%s' does not have our version"
-msgstr "путь «%s» не имеет нашей версии"
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
+msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
-#: builtin/checkout.c:140 builtin/checkout.c:173
+#: wt-status.c:1728
#, c-format
-msgid "path '%s' does not have their version"
-msgstr "путь «%s» не имеет их версии"
+msgid "Untracked files not listed%s"
+msgstr "Неотслеживаемые файлы не показаны%s"
+
+#: wt-status.c:1730
+msgid " (use -u option to show untracked files)"
+msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
+
+#: wt-status.c:1736
+msgid "No changes"
+msgstr "Нет изменений"
-#: builtin/checkout.c:156
+#: wt-status.c:1741
#, c-format
-msgid "path '%s' does not have all necessary versions"
-msgstr "пÑ\83Ñ\82Ñ\8c «%s» не имееÑ\82 вÑ\81еÑ\85 необÑ\85одимÑ\8bÑ\85 веÑ\80Ñ\81ий"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "неÑ\82 изменений добавленнÑ\8bÑ\85 длÑ\8f коммиÑ\82а\n(иÑ\81полÑ\8cзÑ\83йÑ\82е «git add» и/или «git commit -a»)\n"
-#: builtin/checkout.c:200
+#: wt-status.c:1744
#, c-format
-msgid "path '%s' does not have necessary versions"
-msgstr "пÑ\83Ñ\82Ñ\8c «%s» не имееÑ\82 необÑ\85одимÑ\8bÑ\85 веÑ\80Ñ\81ий"
+msgid "no changes added to commit\n"
+msgstr "неÑ\82 изменений добавленнÑ\8bÑ\85 длÑ\8f коммиÑ\82а\n"
-#: builtin/checkout.c:217
+#: wt-status.c:1747
#, c-format
-msgid "path '%s': cannot merge"
-msgstr "путь «%s»: не удалось слить"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
-#: builtin/checkout.c:233
+#: wt-status.c:1750
#, c-format
-msgid "Unable to add merge result for '%s'"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c добавиÑ\82Ñ\8c Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82 Ñ\81лиÑ\8fниÑ\8f «%s»"
+msgid "nothing added to commit but untracked files present\n"
+msgstr "ниÑ\87его не добавлено в коммиÑ\82, но еÑ\81Ñ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b\n"
-#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
-#: builtin/checkout.c:264
+#: wt-status.c:1753
#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "«%s» нельзя использовать при обновлении путей"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
-#: builtin/checkout.c:267 builtin/checkout.c:270
+#: wt-status.c:1756 wt-status.c:1761
#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» нельзя использовать одновременно с %s"
+msgid "nothing to commit\n"
+msgstr "нечего коммитить\n"
-#: builtin/checkout.c:273
+#: wt-status.c:1759
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "Ð\9dелÑ\8cзÑ\8f обновлÑ\8fÑ\82Ñ\8c пÑ\83Ñ\82и и пеÑ\80еклÑ\8eÑ\87аÑ\82Ñ\8cÑ\81Ñ\8f на веÑ\82кÑ\83 «%s» одновÑ\80еменно."
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "неÑ\87его коммиÑ\82иÑ\82Ñ\8c (иÑ\81полÑ\8cзÑ\83йÑ\82е опÑ\86иÑ\8e «-u», Ñ\87Ñ\82обÑ\8b показаÑ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b)\n"
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: wt-status.c:1763
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "пÑ\83Ñ\82Ñ\8c «%s» не Ñ\81лиÑ\82"
+msgid "nothing to commit, working tree clean\n"
+msgstr "неÑ\87его коммиÑ\82иÑ\82Ñ\8c, неÑ\82 изменений в Ñ\80абоÑ\87ем каÑ\82алоге\n"
-#: builtin/checkout.c:508
-msgid "you need to resolve your current index first"
-msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
+#: wt-status.c:1876
+msgid "No commits yet on "
+msgstr "Еще нет коммитов в"
-#: builtin/checkout.c:645
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
-msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
+#: wt-status.c:1880
+msgid "HEAD (no branch)"
+msgstr "HEAD (нет ветки)"
-#: builtin/checkout.c:686
-msgid "HEAD is now at"
-msgstr "HEAD сейчас на"
+#: wt-status.c:1911
+msgid "different"
+msgstr "отличается"
-#: builtin/checkout.c:690 builtin/clone.c:692
-msgid "unable to update HEAD"
-msgstr "не Ñ\83далоÑ\81Ñ\8c обновиÑ\82Ñ\8c HEAD"
+#: wt-status.c:1913 wt-status.c:1921
+msgid "behind "
+msgstr "позади"
-#: builtin/checkout.c:694
-#, c-format
-msgid "Reset branch '%s'\n"
-msgstr "Сброс ветки «%s»\n"
+#: wt-status.c:1916 wt-status.c:1919
+msgid "ahead "
+msgstr "впереди "
-#: builtin/checkout.c:697
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2443
#, c-format
-msgid "Already on '%s'\n"
-msgstr "Уже на «%s»\n"
+msgid "cannot %s: You have unstaged changes."
+msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
+
+#: wt-status.c:2449
+msgid "additionally, your index contains uncommitted changes."
+msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
-#: builtin/checkout.c:701
+#: wt-status.c:2451
#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr "Ð\9fеÑ\80еклÑ\8eÑ\87ение и Ñ\81бÑ\80оÑ\81 веÑ\82ки «%s»\n"
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c %s: Ð\92 ваÑ\88ем индекÑ\81е еÑ\81Ñ\82Ñ\8c незакоммиÑ\87еннÑ\8bе изменениÑ\8f."
-#: builtin/checkout.c:703 builtin/checkout.c:1052
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<опции>] [--] <спецификатор-пути>…"
+
+#: builtin/add.c:84
#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr "Переключено на новую ветку «%s»\n"
+msgid "unexpected diff status %c"
+msgstr "неожиданный статус утилиты сравнения %c"
+
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
+msgstr "сбой при обновлении файлов"
-#: builtin/checkout.c:705
+#: builtin/add.c:99
#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "Переключено на ветку «%s»\n"
+msgid "remove '%s'\n"
+msgstr "удалить «%s»\n"
+
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Непроиндексированные изменения после обновления индекса:"
-#: builtin/checkout.c:756
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
+msgstr "Не удалось прочитать индекс"
+
+#: builtin/add.c:245
#, c-format
-msgid " ... and %d more.\n"
-msgstr " … и еще %d.\n"
+msgid "Could not open '%s' for writing."
+msgstr "Не удалось открыть «%s» для записи."
+
+#: builtin/add.c:249
+msgid "Could not write patch"
+msgstr "Не удалось записать патч"
+
+#: builtin/add.c:252
+msgid "editing patch failed"
+msgstr "сбой при редактировании патча"
-#: builtin/checkout.c:762
+#: builtin/add.c:255
#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] "Предупреждение: вы оставляете позади %d коммит не соединенную ни с одной из ваших веток:\n\n%s\n"
-msgstr[1] "Предупреждение: вы оставляете позади %d коммита не соединенные ни с одной из ваших веток:\n\n%s\n"
-msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
+msgid "Could not stat '%s'"
+msgstr "Не удалось выполнить stat для «%s»"
+
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
+msgstr "Пустой патч. Операция прервана."
-#: builtin/checkout.c:781
+#: builtin/add.c:262
#, c-format
-msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[1] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
+msgid "Could not apply '%s'"
+msgstr "Не удалось применить «%s»"
-#: builtin/checkout.c:813
-msgid "internal error in revision walk"
-msgstr "внÑ\83Ñ\82Ñ\80еннÑ\8fÑ\8f оÑ\88ибка пÑ\80и Ñ\85ождении по Ñ\80едакÑ\86иÑ\8fм"
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "СледÑ\83Ñ\8eÑ\89ие пÑ\83Ñ\82и игноÑ\80иÑ\80Ñ\83Ñ\8eÑ\82Ñ\81Ñ\8f одним из ваÑ\88иÑ\85 Ñ\84айлов .gitignore:\n"
-#: builtin/checkout.c:817
-msgid "Previous HEAD position was"
-msgstr "Предыдущая позиция HEAD была"
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
+msgstr "пробный запуск"
-#: builtin/checkout.c:845 builtin/checkout.c:1047
-msgid "You are on a branch yet to be born"
-msgstr "Ð\92Ñ\8b наÑ\85одиÑ\82еÑ\81Ñ\8c на еÑ\89е не Ñ\81озданной веÑ\82ке"
+#: builtin/add.c:293
+msgid "interactive picking"
+msgstr "инÑ\82еÑ\80акÑ\82ивнÑ\8bй вÑ\8bбоÑ\80"
-#: builtin/checkout.c:952
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "ожидается только одна ссылка, а передано %d."
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+msgid "select hunks interactively"
+msgstr "интерактивный выбор блоков"
-#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
-#, c-format
-msgid "invalid reference: %s"
-msgstr "неправильная ссылка: %s"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr "отредактировать текущий файл списка изменений и применить его"
-#: builtin/checkout.c:1022
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr "в дереве нет такой ссылки: %s"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
+msgstr "разрешить добавление игнорируемых иначе файлов"
-#: builtin/checkout.c:1061
-msgid "paths cannot be used with switching branches"
-msgstr "нелÑ\8cзÑ\8f иÑ\81полÑ\8cзоваÑ\82Ñ\8c пÑ\83Ñ\82и пÑ\80и пеÑ\80еклÑ\8eÑ\87ении веÑ\82ок"
+#: builtin/add.c:297
+msgid "update tracked files"
+msgstr "обновиÑ\82Ñ\8c оÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b"
-#: builtin/checkout.c:1064 builtin/checkout.c:1068
-#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr "нельзя использовать «%s» при переключении веток"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
-#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
-#: builtin/checkout.c:1083
-#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr "«%s» нельзя использовать одновременно с «%s»"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
+msgstr "записать только факт, что путь будет добавлен позже"
-#: builtin/checkout.c:1088
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "Нельзя переключить ветку на не коммит «%s»"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
+msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
-#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
-#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
-#: builtin/worktree.c:435
-msgid "branch"
-msgstr "ветка"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
-#: builtin/checkout.c:1122
-msgid "create and checkout a new branch"
-msgstr "создать и переключиться на новую ветку"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
+msgstr "не добавлять, только обновить индекс"
-#: builtin/checkout.c:1124
-msgid "create/reset and checkout a branch"
-msgstr "создать/сбросить и перключиться на новую ветку"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
+msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
-#: builtin/checkout.c:1125
-msgid "create reflog for new branch"
-msgstr "Ñ\81оздаÑ\82Ñ\8c жÑ\83Ñ\80нал Ñ\81Ñ\81Ñ\8bлок длÑ\8f новой веÑ\82ки"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "Ñ\83доÑ\81Ñ\82овеÑ\80иÑ\82Ñ\8cÑ\81Ñ\8f, Ñ\87Ñ\82о даже недоÑ\81Ñ\82аÑ\8eÑ\89ие Ñ\84айлÑ\8b бÑ\83дÑ\83Ñ\82 пÑ\80оигноÑ\80иÑ\80ованÑ\8b пÑ\80и пÑ\80обном запÑ\83Ñ\81ке"
-#: builtin/checkout.c:1126 builtin/worktree.c:437
-msgid "detach HEAD at named commit"
-msgstr "оÑ\82Ñ\81оединиÑ\82Ñ\8c HEAD на Ñ\83казанном коммиÑ\82е"
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
+msgstr "пеÑ\80еопÑ\80еделиÑ\82Ñ\8c биÑ\82 вÑ\8bполнениÑ\8f на Ñ\83казаннÑ\8bÑ\85 Ñ\84айлаÑ\85"
-#: builtin/checkout.c:1127
-msgid "set upstream info for new branch"
-msgstr "установить информацию о вышестоящей ветке для новой ветки"
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr "предупреждать при добавлении встроенного git репозитория"
-#: builtin/checkout.c:1129
-msgid "new-branch"
-msgstr "новая-ветка"
+#: builtin/add.c:326
+#, 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/checkout.c:1129
-msgid "new unparented branch"
-msgstr "новая ветка без родителей"
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "добавление встроенного git репозитория: %s"
-#: builtin/checkout.c:1131
-msgid "checkout our version for unmerged files"
-msgstr "переключиться на нашу версию для не слитых файлов"
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
-#: builtin/checkout.c:1134
-msgid "checkout their version for unmerged files"
-msgstr "пеÑ\80еклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f на иÑ\85 веÑ\80Ñ\81иÑ\8e длÑ\8f не Ñ\81лиÑ\82Ñ\8bÑ\85 файлов"
+#: builtin/add.c:379
+msgid "adding files failed"
+msgstr "оÑ\88ибка пÑ\80и добавлении файлов"
-#: builtin/checkout.c:1136
-msgid "force checkout (throw away local modifications)"
-msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
+msgstr "-A и -u нельзя использовать одновременно"
-#: builtin/checkout.c:1138
-msgid "perform a 3-way merge with the new branch"
-msgstr "вÑ\8bполниÑ\82Ñ\8c Ñ\82Ñ\80еÑ\85Ñ\85одовое Ñ\81лиÑ\8fние Ñ\81 новой веÑ\82кой"
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Ð\9eпÑ\86иÑ\8f --ignore-missing можеÑ\82 иÑ\81полÑ\8cзоваÑ\82Ñ\8cÑ\81Ñ\8f Ñ\82олÑ\8cко вмеÑ\81Ñ\82е Ñ\81 --dry-run"
-#: builtin/checkout.c:1140 builtin/merge.c:273
-msgid "update ignored files (default)"
-msgstr "обновить игнорируемые файлы (по умолчанию)"
+#: builtin/add.c:430
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "параметр --chmod «%s» должен быть -x или +x"
-#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
-msgid "style"
-msgstr "стиль"
+#: builtin/add.c:445
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Ничего не указано, ничего не добавлено.\n"
-#: builtin/checkout.c:1143
-msgid "conflict style (merge or diff3)"
-msgstr "стиль конфликтов слияния (merge или diff3)"
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Возможно, вы имели в виду «git add .»?\n"
-#: builtin/checkout.c:1146
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "не ограничивать спецификаторы пути только частичными записями"
+#: builtin/am.c:348
+msgid "could not parse author script"
+msgstr "не удалось разобрать сценарий авторства"
-#: builtin/checkout.c:1148
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "пересмотр «git checkout <нет-такой-ветки>»"
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/checkout.c:1150
-msgid "do not check if another worktree is holding the given ref"
-msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
+#: builtin/am.c:474
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Неправильная строка ввода: «%s»."
-#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
-#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "принудительно выводить прогресс"
+#: builtin/am.c:512
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Не удалось скопировать заметку из «%s» в «%s»"
-#: builtin/checkout.c:1184
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B и --orphan нельзя использовать одновременно"
+#: builtin/am.c:538
+msgid "fseek failed"
+msgstr "сбой при выполнении fseek"
-#: builtin/checkout.c:1201
-msgid "--track needs a branch name"
-msgstr "--track требует имя ветки"
+#: builtin/am.c:726
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "не удалось разобрать патч «%s»"
-#: builtin/checkout.c:1206
-msgid "missing branch name; try -b"
-msgstr "пÑ\80опÑ\83Ñ\89ено имÑ\8f веÑ\82ки; попÑ\80обÑ\83йÑ\82е -b"
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "ТолÑ\8cко Ñ\81еÑ\80иÑ\8f паÑ\82Ñ\87ей StGIT можеÑ\82 бÑ\8bÑ\82Ñ\8c пÑ\80именена за Ñ\80аз"
-#: builtin/checkout.c:1243
-msgid "invalid path specification"
-msgstr "недопустимый спецификатор пути"
+#: builtin/am.c:839
+msgid "invalid timestamp"
+msgstr "недопустимая метка даты/времени"
-#: builtin/checkout.c:1250
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
+msgstr "недопустимая строка даты"
-#: builtin/checkout.c:1254
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
+#: builtin/am.c:851
+msgid "invalid timezone offset"
+msgstr "недопустимое смещение часового пояса"
-#: builtin/checkout.c:1258
-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/am.c:944
+msgid "Patch format detection failed."
+msgstr "Сбой определения формата патча."
-#: builtin/checkout.c:1278
+#: builtin/am.c:949 builtin/clone.c:409
#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
-"you can do so by fully qualifying the name with the --track option:\n"
-"\n"
-" git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
+msgid "failed to create directory '%s'"
+msgstr "не удалось создать каталог «%s»"
-#: builtin/clean.c:27
-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/am.c:954
+msgid "Failed to split patches."
+msgstr "Не удалось разделить патчи на части."
-#: builtin/clean.c:31
-#, c-format
-msgid "Removing %s\n"
-msgstr "Удаление %s\n"
+#: builtin/am.c:1084 builtin/commit.c:371
+msgid "unable to write index file"
+msgstr "не удалось записать индекс"
-#: builtin/clean.c:32
+#: builtin/am.c:1098
#, c-format
-msgid "Would remove %s\n"
-msgstr "Ð\91Ñ\83деÑ\82 Ñ\83далено %s\n"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Ð\9aогда вÑ\8b Ñ\83Ñ\81Ñ\82Ñ\80аниÑ\82е Ñ\8dÑ\82Ñ\83 пÑ\80облемÑ\83, запÑ\83Ñ\81Ñ\82иÑ\82е «%s --continue»."
-#: builtin/clean.c:33
+#: builtin/am.c:1099
#, c-format
-msgid "Skipping repository %s\n"
-msgstr "Ð\9fÑ\80опÑ\83Ñ\81к Ñ\80епозиÑ\82оÑ\80иÑ\8f %s\n"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Ð\95Ñ\81ли вÑ\8b Ñ\85оÑ\82иÑ\82е пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 паÑ\82Ñ\87, Ñ\82о запÑ\83Ñ\81Ñ\82иÑ\82е «%s --skip»."
-#: builtin/clean.c:34
+#: builtin/am.c:1100
#, c-format
-msgid "Would skip repository %s\n"
-msgstr "Ð\91Ñ\83деÑ\82 пÑ\80опÑ\83Ñ\89ен Ñ\80епозиÑ\82оÑ\80ий %s\n"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "ЧÑ\82обÑ\8b веÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f на пÑ\80едÑ\8bдÑ\83Ñ\89Ñ\83Ñ\8e веÑ\82кÑ\83 и оÑ\81Ñ\82ановиÑ\82Ñ\8c пÑ\80именение изменений, запÑ\83Ñ\81Ñ\82иÑ\82е «%s --abort»."
-#: builtin/clean.c:35
-#, c-format
-msgid "failed to remove %s"
-msgstr "сбой удаления %s"
+#: builtin/am.c:1183
+msgid ""
+"Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1211
+msgid "Patch is empty."
+msgstr "Патч пустой."
-#: builtin/clean.c:297 git-add--interactive.perl:579
+#: builtin/am.c:1277
#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
-msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n"
+msgid "invalid ident line: %.*s"
+msgstr "неправильная строка идентификации: %.*s"
-#: builtin/clean.c:301 git-add--interactive.perl:588
+#: builtin/am.c:1299
#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting\n"
-msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n"
-
-#: builtin/clean.c:517 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
-msgstr "Хм (%s)?\n"
-
-#: builtin/clean.c:659
-#, c-format
-msgid "Input ignore patterns>> "
-msgstr "Шаблоны игнорирования ввода>> "
-
-#: builtin/clean.c:696
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
-
-#: builtin/clean.c:717
-msgid "Select items to delete"
-msgstr "Укажите элементы для удаления"
+msgid "unable to parse commit %s"
+msgstr "не удалось разобрать коммит %s"
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
-#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Удалить %s [y - да/N - нет]? "
+#: builtin/am.c:1495
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
-#: builtin/clean.c:783 git-add--interactive.perl:1717
-#, c-format
-msgid "Bye.\n"
-msgstr "До свидания.\n"
+#: builtin/am.c:1497
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Использую индекс для реконструкции базового дерева…"
-#: builtin/clean.c:791
+#: builtin/am.c:1516
msgid ""
-"clean - start cleaning\n"
-"filter by pattern - exclude items from deletion\n"
-"select by numbers - select items to be deleted by numbers\n"
-"ask each - confirm each deletion (like \"rm -i\")\n"
-"quit - stop cleaning\n"
-"help - this screen\n"
-"? - help for prompt selection"
-msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению"
-
-#: builtin/clean.c:818 git-add--interactive.perl:1793
-msgid "*** Commands ***"
-msgstr "*** Команды ***"
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
-#: builtin/clean.c:819 git-add--interactive.perl:1790
-msgid "What now"
-msgstr "ЧÑ\82о Ñ\82епеÑ\80Ñ\8c"
+#: builtin/am.c:1522
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Ð\9eÑ\82каÑ\82 к пÑ\80именениÑ\8e изменений к базовомÑ\83 коммиÑ\82Ñ\83 Ñ\81 помоÑ\89Ñ\8cÑ\8e Ñ\82Ñ\80еÑ\85Ñ\85одового Ñ\81лиÑ\8fниÑ\8fâ\80¦"
-#: builtin/clean.c:827
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] "Удалить следующие элементы:"
-msgstr[1] "Удалить следующие элементы:"
-msgstr[2] "Удалить следующие элементы:"
-msgstr[3] "Удалить следующие элементы:"
+#: builtin/am.c:1548
+msgid "Failed to merge in the changes."
+msgstr "Не удалось слить изменения."
-#: builtin/clean.c:843
-msgid "No more files to clean, exiting."
-msgstr "Ð\91олÑ\8cÑ\88е неÑ\82 Ñ\84айлов длÑ\8f оÑ\87иÑ\81Ñ\82ки, вÑ\8bÑ\85одим."
+#: builtin/am.c:1580
+msgid "applying to an empty history"
+msgstr "пÑ\80именение к пÑ\83Ñ\81Ñ\82ой иÑ\81Ñ\82оÑ\80ии"
-#: builtin/clean.c:905
-msgid "do not print names of files removed"
-msgstr "не выводить имена удаляемых файлов"
+#: builtin/am.c:1627 builtin/am.c:1631
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "нельзя продолжнить: %s не существует "
-#: builtin/clean.c:907
-msgid "force"
-msgstr "пÑ\80инÑ\83диÑ\82елÑ\8cно"
+#: builtin/am.c:1647
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "не Ñ\83далоÑ\81Ñ\8c иÑ\81полÑ\8cзоваÑ\82Ñ\8c инÑ\82еÑ\80акÑ\82ивное поведение, без stdin подклÑ\8eÑ\87енного к Ñ\82еÑ\80миналÑ\83."
-#: builtin/clean.c:908
-msgid "interactive cleaning"
-msgstr "инÑ\82еÑ\80акÑ\82ивнаÑ\8f оÑ\87иÑ\81Ñ\82ка"
+#: builtin/am.c:1652
+msgid "Commit Body is:"
+msgstr "Тело коммиÑ\82а:"
-#: builtin/clean.c:910
-msgid "remove whole directories"
-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:1662
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
-#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
-#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
-#: builtin/show-ref.c:177
-msgid "pattern"
-msgstr "шаблон"
+#: builtin/am.c:1712
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)"
-#: builtin/clean.c:912
-msgid "add <pattern> to ignore rules"
-msgstr "добавить <шаблон> в правила игнорирования"
+#: builtin/am.c:1752 builtin/am.c:1820
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Применение: %.*s"
-#: builtin/clean.c:913
-msgid "remove ignored files, too"
-msgstr "также удалить игнорируемые файлы"
+#: builtin/am.c:1769
+msgid "No changes -- Patch already applied."
+msgstr "Нет изменений — Патч уже применен."
-#: builtin/clean.c:915
-msgid "remove only ignored files"
-msgstr "удалить только игнорируемые файлы"
+#: builtin/am.c:1775
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Ошибка применения изменений на %s %.*s"
-#: builtin/clean.c:933
-msgid "-x and -X cannot be used together"
-msgstr "нельзя использовать одновременно -x и -X"
+#: builtin/am.c:1779
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
-#: builtin/clean.c:937
+#: builtin/am.c:1823
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
-" clean"
-msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
+"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/clean.c:940
+#: builtin/am.c:1830
msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
-msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
-#: builtin/clone.c:43
-msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
+#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Не удалось разобрать объект «%s»."
-#: builtin/clone.c:88
-msgid "don't create a checkout"
-msgstr "не переключать рабочую копию на HEAD"
+#: builtin/am.c:1989
+msgid "failed to clean index"
+msgstr "не удалось очистить индекс"
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
-msgid "create a bare repository"
-msgstr "создать голый репозиторий"
+#: builtin/am.c:2033
+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/clone.c:93
-msgid "create a mirror repository (implies bare)"
-msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
+#: builtin/am.c:2130
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Неправильное значение для --patch-format: %s"
-#: builtin/clone.c:95
-msgid "to clone from a local repository"
-msgstr "для клонирования из локального репозитория"
+#: builtin/am.c:2166
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
-#: builtin/clone.c:97
-msgid "don't use local hardlinks, always copy"
-msgstr "не использовать жесткие ссылки, всегда копировать файлы"
+#: builtin/am.c:2167
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/clone.c:99
-msgid "setup as shared repository"
-msgstr "наÑ\81Ñ\82Ñ\80оиÑ\82Ñ\8c как обÑ\89едоÑ\81Ñ\82Ñ\83пнÑ\8bй Ñ\80епозиÑ\82оÑ\80ий"
+#: builtin/am.c:2173
+msgid "run interactively"
+msgstr "запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c в инÑ\82еÑ\80акÑ\82ивном Ñ\80ежиме"
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "pathspec"
-msgstr "спецификатор-пути"
+#: builtin/am.c:2175
+msgid "historical option -- no-op"
+msgstr "историческая опция — ничего не делает"
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "initialize submodules in the clone"
-msgstr "инициализировать подмодули в клоне"
+#: builtin/am.c:2177
+msgid "allow fall back on 3way merging if needed"
+msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
-#: builtin/clone.c:108
-msgid "number of submodules cloned in parallel"
-msgstr "количество подмодулей, которые будут клонированы парралельно"
+#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:306 builtin/stash.c:805
+msgid "be quiet"
+msgstr "тихий режим"
-#: builtin/clone.c:109 builtin/init-db.c:477
-msgid "template-directory"
-msgstr "каÑ\82алог-Ñ\88аблонов"
+#: builtin/am.c:2180
+msgid "add a Signed-off-by line to the commit message"
+msgstr "добавиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80окÑ\83 Signed-off-by к Ñ\81ообÑ\89ениÑ\8e коммиÑ\82а"
-#: builtin/clone.c:110 builtin/init-db.c:478
-msgid "directory from which templates will be used"
-msgstr "каÑ\82алог, Ñ\88аблонÑ\8b из коÑ\82оÑ\80ого бÑ\83дÑ\83Ñ\82 иÑ\81полÑ\8cзованÑ\8b"
+#: builtin/am.c:2183
+msgid "recode into utf8 (default)"
+msgstr "пеÑ\80екодиÑ\80оваÑ\82Ñ\8c в utf8 (по Ñ\83молÑ\87аниÑ\8e)"
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
-#: builtin/submodule--helper.c:1739
-msgid "reference repository"
-msgstr "ссылаемый репозиторий"
+#: builtin/am.c:2185
+msgid "pass -k flag to git-mailinfo"
+msgstr "передать флаг -k в git-mailinfo"
-#: builtin/clone.c:116 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1741
-msgid "use --reference only while cloning"
-msgstr "используйте --reference только при клонировании"
+#: builtin/am.c:2187
+msgid "pass -b flag to git-mailinfo"
+msgstr "передать флаг -b в git-mailinfo"
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3194 builtin/repack.c:320
-msgid "name"
-msgstr "имя"
+#: builtin/am.c:2189
+msgid "pass -m flag to git-mailinfo"
+msgstr "передать флаг -m в git-mailinfo"
-#: builtin/clone.c:118
-msgid "use <name> instead of 'origin' to track upstream"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c <имÑ\8f> вмеÑ\81Ñ\82о «origin» длÑ\8f оÑ\82Ñ\81леживаниÑ\8f вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89его Ñ\80епозиÑ\82оÑ\80иÑ\8f"
+#: builtin/am.c:2191
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "пеÑ\80едаÑ\82Ñ\8c Ñ\84лаг --keep-cr в git-mailsplit длÑ\8f Ñ\84оÑ\80маÑ\82а mbox"
-#: builtin/clone.c:120
-msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "пеÑ\80еклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f на <веÑ\82кÑ\83>, вмеÑ\81Ñ\82о HEAD внеÑ\88него Ñ\80епозиÑ\82оÑ\80иÑ\8f"
+#: builtin/am.c:2194
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "не пеÑ\80едаваÑ\82Ñ\8c --keep-cr Ñ\84лаг в git-mailsplit вне завиÑ\81имоÑ\81Ñ\82и оÑ\82 am.keepcr"
-#: builtin/clone.c:122
-msgid "path to git-upload-pack on the remote"
-msgstr "пÑ\83Ñ\82Ñ\8c к git-upload-pack на внеÑ\88нем Ñ\80епозиÑ\82оÑ\80ии"
+#: builtin/am.c:2197
+msgid "strip everything before a scissors line"
+msgstr "обÑ\80езаÑ\82Ñ\8c вÑ\81е до Ñ\81Ñ\82Ñ\80оки обÑ\80езки"
-#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
-#: builtin/pull.c:216
-msgid "depth"
-msgstr "глубина"
+#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
+#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
+#: builtin/am.c:2226
+msgid "pass it through git-apply"
+msgstr "передать его в git-apply"
-#: builtin/clone.c:124
-msgid "create a shallow clone of that depth"
-msgstr "сделать частичный клон указанной глубины"
+#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
+#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
+#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+msgid "n"
+msgstr "n"
-#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
-#: parse-options.h:154
-msgid "time"
-msgstr "время"
+#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+msgid "format"
+msgstr "формат"
-#: builtin/clone.c:126
-msgid "create a shallow clone since a specific time"
-msgstr "Ñ\81делаÑ\82Ñ\8c Ñ\87аÑ\81Ñ\82иÑ\87нÑ\8bй клон до опÑ\80еделенного вÑ\80емени"
+#: builtin/am.c:2223
+msgid "format the patch(es) are in"
+msgstr "Ñ\84оÑ\80маÑ\82, в коÑ\82оÑ\80ом наÑ\85одÑ\8fÑ\82Ñ\81Ñ\8f паÑ\82Ñ\87и"
-#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
-msgid "revision"
-msgstr "редакция"
+#: builtin/am.c:2229
+msgid "override error message when patch failure occurs"
+msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
-#: builtin/clone.c:128 builtin/fetch.c:144
-msgid "deepen history of shallow clone, excluding rev"
-msgstr "углубить историю частичного клона исключая редакцию"
+#: builtin/am.c:2231
+msgid "continue applying patches after resolving a conflict"
+msgstr "продолжить применение изменений после разрешения конфиликта"
-#: builtin/clone.c:130
-msgid "clone only one branch, HEAD or --branch"
-msgstr "клонировать только одну ветку, HEAD или --branch"
+#: builtin/am.c:2234
+msgid "synonyms for --continue"
+msgstr "синоним для --continue"
-#: builtin/clone.c:132
-msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "не клониÑ\80оваÑ\82Ñ\8c меÑ\82ки, а Ñ\82акже наÑ\81Ñ\82Ñ\80оиÑ\82Ñ\8c, Ñ\87Ñ\82обÑ\8b не клониÑ\80овалиÑ\81Ñ\8c и в далÑ\8cнейÑ\88ем"
+#: builtin/am.c:2237
+msgid "skip the current patch"
+msgstr "пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89ий паÑ\82Ñ\87"
-#: builtin/clone.c:134
-msgid "any cloned submodules will be shallow"
-msgstr "все склонированные подмодули будут частичными клонами"
+#: builtin/am.c:2240
+msgid "restore the original branch and abort the patching operation."
+msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
-#: builtin/clone.c:135 builtin/init-db.c:486
-msgid "gitdir"
-msgstr "каталог-git"
+#: builtin/am.c:2243
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
-#: builtin/clone.c:136 builtin/init-db.c:487
-msgid "separate git dir from working tree"
-msgstr "разместить каталог git отдельно от рабочей копии"
+#: builtin/am.c:2246
+msgid "show the patch being applied."
+msgstr ""
-#: builtin/clone.c:137
-msgid "key=value"
-msgstr "ключ=значение"
+#: builtin/am.c:2250
+msgid "lie about committer date"
+msgstr "соврать о дате коммитера"
-#: builtin/clone.c:138
-msgid "set config inside the new repository"
-msgstr "установить параметры внутри нового репозитория"
+#: builtin/am.c:2252
+msgid "use current timestamp for author date"
+msgstr "использовать текущее время как время авторства"
-#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
-#: builtin/push.c:583
-msgid "use IPv4 addresses only"
-msgstr "использовать только IPv4 адреса"
+#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
+#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
+#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+msgid "key-id"
+msgstr "key-id"
-#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
-#: builtin/push.c:585
-msgid "use IPv6 addresses only"
-msgstr "использовать только IPv6 адреса"
+#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+msgid "GPG-sign commits"
+msgstr "подписать коммиты с помощью GPG"
-#: builtin/clone.c:279
+#: builtin/am.c:2258
+msgid "(internal use for git-rebase)"
+msgstr "(внутреннее использование для git-rebase)"
+
+#: builtin/am.c:2276
msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr "Ð\98мÑ\8f каÑ\82алога не можеÑ\82 бÑ\8bÑ\82Ñ\8c Ñ\83гадано.\nУкажиÑ\82е имÑ\8f каÑ\82алога Ñ\81 помоÑ\89Ñ\8cÑ\8e паÑ\80амеÑ\82Ñ\80а командной Ñ\81Ñ\82Ñ\80оки"
+"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 "Ð\9eпÑ\86иÑ\8f -b/--binary Ñ\83же долгое вÑ\80емÑ\8f ниÑ\87его не делаеÑ\82 и бÑ\83деÑ\82 Ñ\83далена Ñ\81 Ñ\81ледÑ\83Ñ\8eÑ\89иÑ\85 веÑ\80Ñ\81иÑ\8fÑ\85 Git. Ð\9fожалÑ\83йÑ\81Ñ\82а, не иÑ\81полÑ\8cзÑ\83йÑ\82е ее."
-#: builtin/clone.c:332
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
+#: builtin/am.c:2283
+msgid "failed to read the index"
+msgstr "сбой чтения индекса"
-#: builtin/clone.c:404
+#: builtin/am.c:2298
#, c-format
-msgid "failed to open '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c «%s»"
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "пÑ\80едÑ\8bдÑ\83Ñ\89ий каÑ\82алог пеÑ\80емеÑ\89ениÑ\8f %s еÑ\89е Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82, но пеÑ\80едан mbox."
-#: builtin/clone.c:412
+#: builtin/am.c:2322
#, c-format
-msgid "%s exists and is not a directory"
-msgstr "%s уже существует и не является каталогом"
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
-#: builtin/clone.c:426
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "не удалось выполнить stat %s\n"
+#: builtin/am.c:2328
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
-#: builtin/clone.c:448
-#, c-format
-msgid "failed to create link '%s'"
-msgstr "не удалось создать ссылку «%s»"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<опции>] [<патч>…]"
-#: builtin/clone.c:452
+#: builtin/archive.c:17
#, c-format
-msgid "failed to copy file to '%s'"
-msgstr "не удалось копировать файл в «%s»"
+msgid "could not create archive file '%s'"
+msgstr "не удалось создать файл архива «%s»"
-#: builtin/clone.c:478
-#, c-format
-msgid "done.\n"
-msgstr "готово.\n"
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "не удалось перенаправить вывод"
-#: builtin/clone.c:492
-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» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: внешний репозиторий без URL"
-#: builtin/clone.c:569
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr "Не удалось найти внешнюю ветку %s для клонирования."
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: ожидается ACK/NAK, получен пакет сброса буфера"
-#: builtin/clone.c:680
+#: builtin/archive.c:64
#, c-format
-msgid "unable to update %s"
-msgstr "не удалось обновить %s"
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
-#: builtin/clone.c:730
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: ошибка протокола"
-#: builtin/clone.c:760
-msgid "unable to checkout working tree"
-msgstr "не удалось переключиться на версию в рабочем каталоге"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: ожидался сброс буфера"
-#: builtin/clone.c:805
-msgid "unable to write parameters to config file"
-msgstr "не удалось записать параметры в файл конфигурации"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/clone.c:868
-msgid "cannot repack to clean up"
-msgstr "не удалось выполнить перепаковку для очистки"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
-#: builtin/clone.c:870
-msgid "cannot unlink temporary alternates file"
-msgstr "не удалось отсоединить временные альтернативные файлы"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/clone.c:910 builtin/receive-pack.c:1935
-msgid "Too many arguments."
-msgstr "Слишком много аргументов."
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr ""
-#: builtin/clone.c:914
-msgid "You must specify a repository to clone."
-msgstr "Вы должны указать репозиторий для клонирования."
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+"--term-new]"
+msgstr ""
-#: builtin/clone.c:927
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> "
+"--term-{new,bad}=<term>][--no-checkout] [<bad> [<good>...]] [--] "
+"[<paths>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:86
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare и --origin %s нельзя использовать одновременно."
+msgid "'%s' is not a valid term"
+msgstr "«%s» не является допустимым определением"
-#: builtin/clone.c:930
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "нельзя использовать встроенную команду «%s» как определение"
-#: builtin/clone.c:943
+#: builtin/bisect--helper.c:100
#, c-format
-msgid "repository '%s' does not exist"
-msgstr "репозиторий «%s» не существует"
+msgid "can't change the meaning of the term '%s'"
+msgstr "нельзя изменить значение определения «%s»"
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr "используйте два разных определения"
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr "не удалось открыть файл BISECT_TERMS"
-#: builtin/clone.c:949 builtin/fetch.c:1512
+#: builtin/bisect--helper.c:155
#, c-format
-msgid "depth %s is not a positive number"
-msgstr "глубина %s не является положительным числом"
+msgid "We are not bisecting.\n"
+msgstr ""
-#: builtin/clone.c:959
+#: builtin/bisect--helper.c:163
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
+msgid "'%s' is not a valid commit"
+msgstr ""
-#: builtin/clone.c:969
+#: builtin/bisect--helper.c:174
#, c-format
-msgid "working tree '%s' already exists."
-msgstr "рабочий каталог «%s» уже существует."
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
-#: builtin/worktree.c:246 builtin/worktree.c:276
+#: builtin/bisect--helper.c:215
#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr "не удалось создать родительские каталоги для «%s»"
+msgid "Bad bisect_write argument: %s"
+msgstr ""
-#: builtin/clone.c:989
+#: builtin/bisect--helper.c:220
#, c-format
-msgid "could not create work tree dir '%s'"
-msgstr "не удалось создать рабочий каталог «%s»"
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
-#: builtin/clone.c:1009
+#: builtin/bisect--helper.c:232
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
-msgstr "Клонирование в голый репозиторий «%s»…\n"
+msgid "couldn't open the file '%s'"
+msgstr ""
-#: builtin/clone.c:1011
+#: builtin/bisect--helper.c:258
#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr "Клонирование в «%s»…\n"
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
-#: builtin/clone.c:1035
+#: builtin/bisect--helper.c:285
+#, c-format
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-"
-"if-able"
-msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
-#: builtin/clone.c:1096
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
-#: builtin/clone.c:1098
-msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr ""
-#: builtin/clone.c:1100
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "Вы уверены [Y - да/n - нет]? "
-#: builtin/clone.c:1102
-msgid "--filter is ignored in local clones; use file:// instead."
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "определения не заданы"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
msgstr ""
-#: builtin/clone.c:1105
-msgid "source repository is shallow, ignoring --local"
-msgstr "исходный репозиторий является частичным, --local игнорируется"
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
-#: builtin/clone.c:1110
-msgid "--local is ignored"
-msgstr "--local игнорируется"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
-#: builtin/clone.c:1180 builtin/clone.c:1188
+#: builtin/bisect--helper.c:479
#, c-format
-msgid "Remote branch %s not found in upstream %s"
-msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
-#: builtin/clone.c:1191
-msgid "You appear to have cloned an empty repository."
-msgstr "Похоже, что вы клонировали пустой репозиторий."
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
-msgstr "git column [<опции>]"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
-msgstr "запÑ\80оÑ\81иÑ\82Ñ\8c пеÑ\80еменнÑ\8bе конÑ\84игÑ\83Ñ\80аÑ\86ии"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "нелÑ\8cзÑ\8f вÑ\8bполниÑ\82Ñ\8c двоиÑ\87нÑ\8bй поиÑ\81к на деÑ\80еве поÑ\81ле cg-seek"
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
-msgstr "использовать схему расположения"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Ð\9cакÑ\81ималÑ\8cнаÑ\8f Ñ\88иÑ\80ина"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
+msgstr "вÑ\8bполниÑ\82Ñ\8c «git bisect next»"
-#: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "РаÑ\81Ñ\81Ñ\82оÑ\8fние оÑ\82Ñ\81Ñ\82Ñ\83па Ñ\81лева"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "запиÑ\81аÑ\82Ñ\8c опÑ\80еделениÑ\8f в .git/BISECT_TERMS"
-#: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "РаÑ\81Ñ\81Ñ\82оÑ\8fние оÑ\82Ñ\81Ñ\82Ñ\83па Ñ\81пÑ\80ава"
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
+msgstr "оÑ\87иÑ\81Ñ\82иÑ\82Ñ\8c Ñ\81оÑ\81Ñ\82оÑ\8fние двоиÑ\87ного поиÑ\81ка"
-#: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "РаÑ\81Ñ\81Ñ\82оÑ\8fние оÑ\82Ñ\81Ñ\82Ñ\83па междÑ\83 колонками"
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
+msgstr "пÑ\80овеÑ\80иÑ\82Ñ\8c ожидаемÑ\8bе Ñ\80едакÑ\86ии"
-#: builtin/column.c:51
-msgid "--command must be the first argument"
-msgstr "параметр --command должен быть первым"
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr ""
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<опции>] [--] <спецификатор-пути>…"
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<опции>] [--] <спецификатор-пути>…"
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr ""
-#: builtin/commit.c:48
-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/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr ""
-#: builtin/commit.c:53
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
-msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n"
-
-#: builtin/commit.c:60
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "В противном случае, используйте «git reset»\n"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr ""
-#: builtin/commit.c:63
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr ""
-#: builtin/commit.c:306
-msgid "failed to unpack HEAD tree object"
-msgstr "сбой распаковки объекта дерева HEAD"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
-#: builtin/commit.c:347
-msgid "unable to create temporary index"
-msgstr "не удалось создать временный индекс"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr ""
-#: builtin/commit.c:353
-msgid "interactive add failed"
-msgstr "сбой интерактивного добавления"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms требует указания двух параметров"
-#: builtin/commit.c:366
-msgid "unable to update temporary index"
-msgstr "не удалось обновить временный индекс"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state не требует указания параметров"
-#: builtin/commit.c:368
-msgid "Failed to update main cache tree"
-msgstr "Сбой при обновлении основного кэша дерева"
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
-msgid "unable to write new_index file"
-msgstr "не удалось записать файл new_index"
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
-#: builtin/commit.c:445
-msgid "cannot do a partial commit during a merge."
-msgstr "нельзя создать частичный коммит во время слияния."
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
-#: builtin/commit.c:447
-msgid "cannot do a partial commit during a cherry-pick."
-msgstr "нельзя создать частичный коммит во время копирования коммита."
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
-#: builtin/commit.c:455
-msgid "cannot read the index"
-msgstr "не удалось прочитать индекс"
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
-#: builtin/commit.c:474
-msgid "unable to write temporary index file"
-msgstr "не удалось записать временный файл индекса"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
-#: builtin/commit.c:571
-#, c-format
-msgid "commit '%s' lacks author header"
-msgstr "у коммита «%s» отсутствует автор в заголовке"
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<опции-rev-list> документированы в git-rev-list(1)"
-#: builtin/commit.c:573
+#: builtin/blame.c:407
#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr "у коммита «%s» строка автора в неправильном формате"
-
-#: builtin/commit.c:592
-msgid "malformed --author parameter"
-msgstr "параметр --author в неправильном формате"
+msgid "expecting a color: %s"
+msgstr "ожидается цвет: %s"
-#: builtin/commit.c:644
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
-msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
+#: builtin/blame.c:414
+msgid "must end with a color"
+msgstr "должно заканчиваться на цвет"
-#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
+#: builtin/blame.c:701
#, c-format
-msgid "could not lookup commit %s"
-msgstr "не удалось запросить коммит %s"
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
-#: builtin/commit.c:693 builtin/shortlog.c:317
-#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr "(чтение файла журнала из стандартного ввода)\n"
+#: builtin/blame.c:719
+msgid "invalid value for blame.coloring"
+msgstr ""
-#: builtin/commit.c:695
-msgid "could not read log from standard input"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\84айл жÑ\83Ñ\80нала из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
+#: builtin/blame.c:794
+msgid "Show blame entries as we find them, incrementally"
+msgstr "Ð\9fоказаÑ\82Ñ\8c запиÑ\81и авÑ\82оÑ\80Ñ\81Ñ\82ва поÑ\81Ñ\82епенно, в пÑ\80оÑ\86еÑ\81Ñ\81е наÑ\85ождениÑ\8f"
-#: builtin/commit.c:699
-#, c-format
-msgid "could not read log file '%s'"
-msgstr "не удалось прочитать файл журнала «%s»"
+#: builtin/blame.c:795
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
-#: builtin/commit.c:728 builtin/commit.c:736
-msgid "could not read SQUASH_MSG"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c SQUASH_MSG"
+#: builtin/blame.c:796
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "Ð\9dе воÑ\81пÑ\80инимаÑ\82Ñ\8c коÑ\80невÑ\8bе коммиÑ\82Ñ\8b как гÑ\80аниÑ\87нÑ\8bе (Ð\9fо Ñ\83молÑ\87аниÑ\8e: оÑ\82клÑ\8eÑ\87ено)"
-#: builtin/commit.c:733
-msgid "could not read MERGE_MSG"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c MERGE_MSG"
+#: builtin/blame.c:797
+msgid "Show work cost statistics"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 Ñ\80аÑ\81Ñ\85одов на вÑ\8bполнение запÑ\80оÑ\81а"
-#: builtin/commit.c:787
-msgid "could not write commit template"
-msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c Ñ\88аблон опиÑ\81аниÑ\8f коммиÑ\82а"
+#: builtin/blame.c:798
+msgid "Force progress reporting"
+msgstr "Ð\9fÑ\80инÑ\83диÑ\82елÑ\8cно вÑ\8bводиÑ\82Ñ\8c пÑ\80огÑ\80еÑ\81Ñ\81 вÑ\8bполнениÑ\8f"
-#: builtin/commit.c:805
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n"
+#: builtin/blame.c:799
+msgid "Show output score for blame entries"
+msgstr "Показать оценку для записей авторства"
-#: builtin/commit.c:810
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n"
+#: builtin/blame.c:800
+msgid "Show original filename (Default: auto)"
+msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
-#: builtin/commit.c:823
-#, 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/blame.c:801
+msgid "Show original linenumber (Default: off)"
+msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
-#: builtin/commit.c:831
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
+#: builtin/blame.c:802
+msgid "Show in a format designed for machine consumption"
+msgstr "Показать в формате для программного разбора"
-#: builtin/commit.c:848
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
-msgstr "%sАвтор: %.*s <%.*s>"
+#: builtin/blame.c:803
+msgid "Show porcelain format with per-line commit information"
+msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
-#: builtin/commit.c:856
-#, c-format
-msgid "%sDate: %s"
-msgstr "%sДата: %s"
+#: builtin/blame.c:804
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/commit.c:863
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
-msgstr "%sКоммитер: %.*s <%.*s>"
+#: builtin/blame.c:805
+msgid "Show raw timestamp (Default: off)"
+msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/commit.c:880
-msgid "Cannot read index"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c индекÑ\81"
+#: builtin/blame.c:806
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "Ð\9fоказаÑ\82Ñ\8c длиннÑ\8bй SHA1 иденÑ\82иÑ\84икаÑ\82оÑ\80 коммиÑ\82а (Ð\9fо Ñ\83молÑ\87аниÑ\8e: оÑ\82клÑ\8eÑ\87ено)"
-#: builtin/commit.c:946
-msgid "Error building trees"
-msgstr "Ð\9eÑ\88ибка пÑ\80и поÑ\81Ñ\82Ñ\80оении деÑ\80евÑ\8cев"
+#: builtin/blame.c:807
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "Ð\9dе показÑ\8bваÑ\82Ñ\8c имÑ\8f авÑ\82оÑ\80а и вÑ\80еменнÑ\8bе меÑ\82ки (Ð\9fо Ñ\83молÑ\87аниÑ\8e: оÑ\82клÑ\8eÑ\87ено)"
-#: builtin/commit.c:960 builtin/tag.c:258
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
-msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
+#: builtin/blame.c:808
+msgid "Show author email instead of name (Default: off)"
+msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
-#: builtin/commit.c:1004
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
+#: builtin/blame.c:809
+msgid "Ignore whitespace differences"
+msgstr "Игнорировать различия в пробелах"
-#: builtin/commit.c:1018
-#, c-format
-msgid "Invalid ignored mode '%s'"
-msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
+#: builtin/blame.c:810
+msgid "color redundant metadata from previous line differently"
+msgstr ""
-#: builtin/commit.c:1032 builtin/commit.c:1269
-#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr "Неправильный режим неотслеживаемых файлов «%s»"
+#: builtin/blame.c:811
+msgid "color lines by age"
+msgstr ""
-#: builtin/commit.c:1070
-msgid "--long and -z are incompatible"
-msgstr "--long и -z нельзя использовать одновременно"
+#: builtin/blame.c:818
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы списка изменений"
-#: builtin/commit.c:1103
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "Указание одновÑ\80еменно опÑ\86ий --reset-author и --author не имееÑ\82 Ñ\81мÑ\8bÑ\81ла"
+#: builtin/blame.c:820
+msgid "Spend extra cycles to find better match"
+msgstr "Ð\9fоÑ\82Ñ\80аÑ\82иÑ\82Ñ\8c болÑ\8cÑ\88е вÑ\80емени, длÑ\8f наÑ\85ождениÑ\8f лÑ\83Ñ\87Ñ\88иÑ\85 Ñ\81овпадений"
-#: builtin/commit.c:1112
-msgid "You have nothing to amend."
-msgstr "Ð\9dеÑ\87его иÑ\81пÑ\80авлÑ\8fÑ\82Ñ\8c."
+#: builtin/blame.c:821
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\80едакÑ\86ии из <Ñ\84айла> вмеÑ\81Ñ\82о вÑ\8bзова git-rev-list"
-#: builtin/commit.c:1115
-msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Ð\92Ñ\8b в пÑ\80оÑ\86еÑ\81Ñ\81е Ñ\81лиÑ\8fниÑ\8f â\80\94 Ñ\81ейÑ\87аÑ\81 нелÑ\8cзÑ\8f иÑ\81пÑ\80авлÑ\8fÑ\82Ñ\8c."
+#: builtin/blame.c:822
+msgid "Use <file>'s contents as the final image"
+msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81одеÑ\80жимое <Ñ\84айла> как Ñ\84иналÑ\8cнÑ\8bй Ñ\81нимок"
-#: builtin/commit.c:1117
-msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Ð\92Ñ\8b в пÑ\80оÑ\86еÑ\81Ñ\81е копиÑ\80ованиÑ\8f коммиÑ\82а â\80\94 Ñ\81ейÑ\87аÑ\81 нелÑ\8cзÑ\8f иÑ\81пÑ\80авлÑ\8fÑ\82Ñ\8c."
+#: builtin/blame.c:823 builtin/blame.c:824
+msgid "score"
+msgstr "мин-длина"
-#: builtin/commit.c:1120
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "Ð\9eпÑ\86ии --squash и --fixup не могÑ\83Ñ\82 иÑ\81полÑ\8cзоваÑ\82Ñ\8cÑ\81Ñ\8f одновÑ\80еменно"
+#: builtin/blame.c:823
+msgid "Find line copies within and across files"
+msgstr "Ð\9dайÑ\82и копиÑ\80ование Ñ\81Ñ\82Ñ\80ок в пÑ\80еделаÑ\85 и междÑ\83 Ñ\84айлами"
-#: builtin/commit.c:1130
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Ð\9cожеÑ\82 иÑ\81полÑ\8cзоваÑ\82Ñ\8cÑ\81Ñ\8f Ñ\82олÑ\8cко одна из опÑ\86ий -c/-C/-F/--fixup."
+#: builtin/blame.c:824
+msgid "Find line movements within and across files"
+msgstr "Ð\9dайÑ\82и пеÑ\80емеÑ\89ениÑ\8f Ñ\81Ñ\82Ñ\80ок в пÑ\80еделаÑ\85 и междÑ\83 Ñ\84айлами"
-#: builtin/commit.c:1132
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr ""
+#: builtin/blame.c:825
+msgid "n,m"
+msgstr "начало,конец"
-#: builtin/commit.c:1140
-msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
+#: builtin/blame.c:825
+msgid "Process only line range n,m, counting from 1"
+msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
-#: builtin/commit.c:1157
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
+#: builtin/blame.c:876
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
-#: builtin/commit.c:1159
-msgid "No paths with --include/--only does not make sense."
-msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
+#. 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:927
+msgid "4 years, 11 months ago"
+msgstr "4 года и 11 месяцев назад"
-#: builtin/commit.c:1173 builtin/tag.c:544
+#: builtin/blame.c:1031
#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Неправильное значение режима очистки %s"
-
-#: builtin/commit.c:1178
-msgid "Paths with -a does not make sense."
-msgstr "С опцией -a указание пути не имеет смысла."
-
-#: builtin/commit.c:1303 builtin/commit.c:1480
-msgid "show status concisely"
-msgstr "кратко показать статус"
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "файл %s содержит только %lu строку"
+msgstr[1] "файл %s содержит только %lu строки"
+msgstr[2] "файл %s содержит только %lu строк"
+msgstr[3] "файл %s содержит только %lu строки"
-#: builtin/commit.c:1305 builtin/commit.c:1482
-msgid "show branch information"
-msgstr "показаÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о веÑ\80Ñ\81ии"
+#: builtin/blame.c:1077
+msgid "Blaming lines"
+msgstr "Ð\9fÑ\80оÑ\81моÑ\82Ñ\80 авÑ\82оÑ\80ов Ñ\81Ñ\82Ñ\80ок"
-#: builtin/commit.c:1307
-msgid "show stash information"
-msgstr "показать информацию о спрятанном"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
-#: builtin/commit.c:1309 builtin/commit.c:1484
-msgid "compute full ahead/behind values"
-msgstr ""
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]"
-#: builtin/commit.c:1311
-msgid "version"
-msgstr "версия"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…"
-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:581
-msgid "machine-readable output"
-msgstr "машиночитаемый вывод"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
-#: builtin/commit.c:1314 builtin/commit.c:1488
-msgid "show status in long format (default)"
-msgstr "показать статус в длинном формате (по умолчанию)"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>"
-#: builtin/commit.c:1317 builtin/commit.c:1491
-msgid "terminate entries with NUL"
-msgstr "завершать записи НУЛЕВЫМ байтом"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<опции>] [-r | -a] [--points-at]"
-#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
-msgid "mode"
-msgstr "режим"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<опции>] [-r | -a] [--format]"
-#: builtin/commit.c:1320 builtin/commit.c:1494
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
+#: builtin/branch.c:151
+#, 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/commit.c:1324
+#: builtin/branch.c:155
+#, c-format
msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
-msgstr "показÑ\8bваÑ\82Ñ\8c игноÑ\80иÑ\80Ñ\83емÑ\8bе Ñ\84айлÑ\8b, Ñ\81 опÑ\86ионалÑ\8cнÑ\8bм Ñ\80ежимом: traditional (Ñ\82Ñ\80адиÑ\86ионнÑ\8bй), matching (Ñ\82олÑ\8cко Ñ\81овпадаÑ\8eÑ\89ие), no (не показÑ\8bваÑ\82Ñ\8c). (Ð\9fо Ñ\83молÑ\87аниÑ\8e: traditional)"
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr "не Ñ\83даление веÑ\82ки «%s», коÑ\82оÑ\80аÑ\8f еÑ\89е не Ñ\81лиÑ\82а Ñ\81\n «%s», Ñ\85оÑ\82Ñ\8f Ñ\83же Ñ\81лиÑ\82а Ñ\81 HEAD."
-#: builtin/commit.c:1326 parse-options.h:167
-msgid "when"
-msgstr "когда"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Не удалось найти объект коммита для «%s»"
-#: builtin/commit.c:1327
+#: builtin/branch.c:173
+#, c-format
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
-msgstr "игноÑ\80иÑ\80оваÑ\82Ñ\8c изменениÑ\8f в подмодÑ\83лÑ\8fÑ\85, опÑ\86ионалÑ\8cно когда: all (вÑ\81егда), dirty (измененнÑ\8bе), untracked (неоÑ\82Ñ\81леживаемÑ\8bе). (Ð\9fо Ñ\83молÑ\87аниÑ\8e: all)"
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr "Ð\92еÑ\82ка «%s» не Ñ\81лиÑ\82а полноÑ\81Ñ\82Ñ\8cÑ\8e.\nÐ\95Ñ\81ли вÑ\8b Ñ\83веÑ\80енÑ\8b, Ñ\87Ñ\82о Ñ\85оÑ\82иÑ\82е ее Ñ\83далиÑ\82Ñ\8c, запÑ\83Ñ\81Ñ\82иÑ\82е «git branch -D %s»."
-#: builtin/commit.c:1329
-msgid "list untracked files in columns"
-msgstr "показаÑ\82Ñ\8c неоÑ\82Ñ\81леживаемÑ\8bе Ñ\84айлÑ\8b по Ñ\81Ñ\82олбÑ\86ам"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c обновиÑ\82Ñ\8c Ñ\84айл конÑ\84игÑ\83Ñ\80аÑ\86ии"
-#: builtin/commit.c:1330
-msgid "do not detect renames"
-msgstr "не определять переименования"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr "нельзя использовать одновременно ключи -a и -d"
-#: builtin/commit.c:1332
-msgid "detect renames, optionally set similarity index"
-msgstr "опÑ\80еделÑ\8fÑ\82Ñ\8c пеÑ\80еименованиÑ\8f, опÑ\86ионалÑ\8cно Ñ\83Ñ\81Ñ\82анавливаÑ\82Ñ\8c Ñ\80ейÑ\82инг Ñ\81Ñ\85одÑ\81Ñ\82ва"
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и обÑ\8aекÑ\82 коммиÑ\82а длÑ\8f HEAD"
-#: builtin/commit.c:1352
-msgid "Unsupported combination of ignored and untracked-files arguments"
-msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
-#: builtin/commit.c:1450
-msgid "suppress summary after successful commit"
-msgstr "не выводить сводку после успешного коммита"
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "внешняя отслеживаемая ветка «%s» не найдена."
-#: builtin/commit.c:1451
-msgid "show diff in commit message template"
-msgstr "добавить список изменений в шаблон сообщения коммита"
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
+msgstr "ветка «%s» не найдена."
-#: builtin/commit.c:1453
-msgid "Commit message options"
-msgstr "Опции сообщения коммита"
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
-#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
-msgid "read message from file"
-msgstr "прочитать сообщение из файла"
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "Ошибка удаления ветки «%s»"
-#: builtin/commit.c:1455
-msgid "author"
-msgstr "автор"
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
-#: builtin/commit.c:1455
-msgid "override author for commit"
-msgstr "подменить автора коммита"
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/commit.c:1456 builtin/gc.c:504
-msgid "date"
-msgstr "дата"
+#: builtin/branch.c:421 builtin/tag.c:60
+msgid "unable to parse format string"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80окÑ\83 Ñ\84оÑ\80мата"
-#: builtin/commit.c:1456
-msgid "override date for commit"
-msgstr "подменить дату коммита"
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
+msgstr ""
-#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
-#: builtin/notes.c:567 builtin/tag.c:393
-msgid "message"
-msgstr "сообщение"
+#: builtin/branch.c:458
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr ""
-#: builtin/commit.c:1457
-msgid "commit message"
-msgstr "сообщение коммита"
+#: builtin/branch.c:473
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Производится перемещение ветки %s на %s"
-#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
-#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
-msgid "commit"
-msgstr "коммиÑ\82"
+#: builtin/branch.c:477
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Ð\9fÑ\80оизводиÑ\82Ñ\81Ñ\8f двоиÑ\87нÑ\8bй поиÑ\81к в веÑ\82ке %s на %s"
-#: builtin/commit.c:1458
-msgid "reuse and edit message from specified commit"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c и оÑ\82Ñ\80едакÑ\82иÑ\80оваÑ\82Ñ\8c Ñ\81ообÑ\89ение оÑ\82 Ñ\83казанного коммиÑ\82а"
+#: builtin/branch.c:494
+msgid "cannot copy the current branch while not on any."
+msgstr "невозможно Ñ\81копиÑ\80оваÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89Ñ\83Ñ\8e веÑ\82кÑ\83, еÑ\81ли вÑ\8b не наÑ\85одиÑ\82еÑ\81Ñ\8c ни на одной из веÑ\82ок."
-#: builtin/commit.c:1459
-msgid "reuse message from specified commit"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81ообÑ\89ение Ñ\83казанного коммиÑ\82а"
+#: builtin/branch.c:496
+msgid "cannot rename the current branch while not on any."
+msgstr "невозможно пеÑ\80еименоваÑ\82Ñ\8c Ñ\82екÑ\83Ñ\89Ñ\83Ñ\8e веÑ\82кÑ\83, еÑ\81ли вÑ\8b не наÑ\85одиÑ\82еÑ\81Ñ\8c ни на одной из ниÑ\85."
-#: builtin/commit.c:1460
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
+#: builtin/branch.c:507
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Недействительное имя ветки: «%s»"
-#: builtin/commit.c:1461
-msgid "use autosquash formatted message to squash specified commit"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\84оÑ\80маÑ\82иÑ\80ованное Ñ\81ообÑ\89ение авÑ\82оÑ\83плоÑ\82нениÑ\8f длÑ\8f Ñ\83плоÑ\82нениÑ\8f Ñ\83казанного коммиÑ\82а"
+#: builtin/branch.c:534
+msgid "Branch rename failed"
+msgstr "Сбой пеÑ\80еименованиÑ\8f веÑ\82ки"
-#: builtin/commit.c:1462
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "коммиÑ\82 Ñ\82епеÑ\80Ñ\8c за моим авÑ\82оÑ\80Ñ\81Ñ\82вом (иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f Ñ\81 -C/-c/--amend)"
+#: builtin/branch.c:536
+msgid "Branch copy failed"
+msgstr "Сбой копиÑ\80ованиÑ\8f веÑ\82ки"
-#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
-#: builtin/pull.c:154 builtin/revert.c:106
-msgid "add Signed-off-by:"
-msgstr "добавиÑ\82Ñ\8c Signed-off-by:"
+#: builtin/branch.c:540
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Создана копиÑ\8f непÑ\80авилÑ\8cно названной веÑ\82ки «%s»"
-#: builtin/commit.c:1464
-msgid "use specified template file"
-msgstr "использовать указанный файл шаблона"
+#: builtin/branch.c:543
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Переименована неправильно названная ветка «%s»"
-#: builtin/commit.c:1465
-msgid "force edit of commit"
-msgstr "принудительно редактировать коммит"
+#: builtin/branch.c:549
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/commit.c:1466
-msgid "default"
-msgstr "по-Ñ\83молÑ\87аниÑ\8e"
+#: builtin/branch.c:558
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "Ð\92еÑ\82ка пеÑ\80еименована, но пÑ\80оизоÑ\88ел Ñ\81бой обновлениÑ\8f Ñ\84айла конÑ\84игÑ\83Ñ\80аÑ\86ии"
-#: builtin/commit.c:1466 builtin/tag.c:399
-msgid "how to strip spaces and #comments from message"
-msgstr "как Ñ\83далÑ\8fÑ\82Ñ\8c пÑ\80обелÑ\8b и #комменÑ\82аÑ\80ии из Ñ\81ообÑ\89ениÑ\8f коммиÑ\82а"
+#: builtin/branch.c:560
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Ð\92еÑ\82ка Ñ\81копиÑ\80ована, но пÑ\80оизоÑ\88ел Ñ\81бой обновлениÑ\8f Ñ\84айла конÑ\84игÑ\83Ñ\80аÑ\86ии"
-#: builtin/commit.c:1467
-msgid "include status in commit message template"
-msgstr "включить статус файлов в шаблон сообщения коммита"
+#: builtin/branch.c:576
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
-#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
-#: builtin/revert.c:114
-msgid "GPG sign commit"
-msgstr "подписать коммит с помощью GPG"
+#: builtin/branch.c:610
+msgid "Generic options"
+msgstr "Общие параметры"
-#: builtin/commit.c:1472
-msgid "Commit contents options"
-msgstr "Ð\9eпÑ\86ии Ñ\81одеÑ\80жимого коммиÑ\82а"
+#: builtin/branch.c:612
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\85еÑ\88-Ñ\81Ñ\83ммÑ\83 и Ñ\82емÑ\83, Ñ\83кажиÑ\82е дваждÑ\8b длÑ\8f вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ки"
-#: builtin/commit.c:1473
-msgid "commit all changed files"
-msgstr "закоммиÑ\82иÑ\82Ñ\8c вÑ\81е измененнÑ\8bе Ñ\84айлÑ\8b"
+#: builtin/branch.c:613
+msgid "suppress informational messages"
+msgstr "не вÑ\8bводиÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86ионнÑ\8bе Ñ\81ообÑ\89ениÑ\8f"
-#: builtin/commit.c:1474
-msgid "add specified files to index for commit"
-msgstr "добавить указанные файлы в индекс для коммита"
+#: builtin/branch.c:614
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
-#: builtin/commit.c:1475
-msgid "interactively add files"
-msgstr "инÑ\82еÑ\80акÑ\82ивное добавление Ñ\84айлов"
+#: builtin/branch.c:616
+msgid "do not use"
+msgstr "не иÑ\81полÑ\8cзÑ\83йÑ\82е"
-#: builtin/commit.c:1476
-msgid "interactively add changes"
-msgstr "инÑ\82еÑ\80акÑ\82ивное добавление изменений"
+#: builtin/branch.c:618 builtin/rebase.c:485
+msgid "upstream"
+msgstr "вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89аÑ\8f"
-#: builtin/commit.c:1477
-msgid "commit only specified files"
-msgstr "закоммиÑ\82иÑ\82Ñ\8c Ñ\82олÑ\8cко Ñ\83казаннÑ\8bе Ñ\84айлÑ\8b"
+#: builtin/branch.c:618
+msgid "change the upstream info"
+msgstr "измениÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ке"
-#: builtin/commit.c:1478
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr "пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c пеÑ\80еÑ\85ваÑ\82Ñ\87ик pre-commit и commit-msg"
+#: builtin/branch.c:619
+msgid "Unset the upstream info"
+msgstr "УбÑ\80аÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ке"
-#: builtin/commit.c:1479
-msgid "show what would be committed"
-msgstr "показаÑ\82Ñ\8c, Ñ\87Ñ\82о бÑ\83деÑ\82 закоммиÑ\87ено"
+#: builtin/branch.c:620
+msgid "use colored output"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\86веÑ\82ной вÑ\8bвод"
-#: builtin/commit.c:1492
-msgid "amend previous commit"
-msgstr "иÑ\81пÑ\80авиÑ\82Ñ\8c пÑ\80едÑ\8bдÑ\83Ñ\89ий коммиÑ\82"
+#: builtin/branch.c:621
+msgid "act on remote-tracking branches"
+msgstr "вÑ\8bполниÑ\82Ñ\8c дейÑ\81Ñ\82виÑ\8f на оÑ\82Ñ\81леживаемÑ\8bÑ\85 внеÑ\88ниÑ\85 веÑ\82каÑ\85"
-#: builtin/commit.c:1493
-msgid "bypass post-rewrite hook"
-msgstr "пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c пеÑ\80еÑ\85ваÑ\82Ñ\87ик post-rewrite"
+#: builtin/branch.c:623 builtin/branch.c:625
+msgid "print only branches that contain the commit"
+msgstr "вÑ\8bвод Ñ\82олÑ\8cко веÑ\82ок, коÑ\82оÑ\80Ñ\8bе Ñ\81одеÑ\80жаÑ\82 коммиÑ\82"
-#: builtin/commit.c:1498
-msgid "ok to record an empty change"
-msgstr "разрешить запись пустого коммита"
+#: builtin/branch.c:624 builtin/branch.c:626
+msgid "print only branches that don't contain the commit"
+msgstr "вывод только веток, которые не содержат коммит"
-#: builtin/commit.c:1500
-msgid "ok to record a change with an empty message"
-msgstr "разрешить запись изменений с пустым сообщением"
+#: builtin/branch.c:629
+msgid "Specific git-branch actions:"
+msgstr "Специфичные для git-branch действия:"
-#: builtin/commit.c:1573
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "Файл MERGE_HEAD поврежден (%s)"
-
-#: builtin/commit.c:1580
-msgid "could not read MERGE_MODE"
-msgstr "не удалось прочитать MERGE_MODE"
+#: builtin/branch.c:630
+msgid "list both remote-tracking and local branches"
+msgstr "показать список и отслеживаемых и локальных веток"
-#: builtin/commit.c:1599
-#, c-format
-msgid "could not read commit message: %s"
-msgstr "не удалось открыть сообщение коммита: %s"
+#: builtin/branch.c:632
+msgid "delete fully merged branch"
+msgstr "удалить полностью слитую ветку"
-#: builtin/commit.c:1610
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
+#: builtin/branch.c:633
+msgid "delete branch (even if not merged)"
+msgstr "удалить ветку (даже никуда не слитую)"
-#: builtin/commit.c:1615
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Отмена коммита; вы не изменили сообщение.\n"
+#: builtin/branch.c:634
+msgid "move/rename a branch and its reflog"
+msgstr "переместить/переименовать ветки и ее журнал ссылок"
-#: builtin/commit.c:1650
-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/branch.c:635
+msgid "move/rename a branch, even if target exists"
+msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
-#: builtin/commit-graph.c:10
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <каталог-объектов>]"
+#: builtin/branch.c:636
+msgid "copy a branch and its reflog"
+msgstr "скопировать ветку и её журнал ссылок"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <каталог-объектов>]"
+#: builtin/branch.c:637
+msgid "copy a branch, even if target exists"
+msgstr "скопировать ветку, даже если целевое имя уже существует"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <каталог-объектов>]"
+#: builtin/branch.c:638
+msgid "list branch names"
+msgstr "показать список имен веток"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable"
-"|--stdin-packs|--stdin-commits]"
-msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
+#: builtin/branch.c:639
+msgid "show current branch name"
+msgstr ""
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
-#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
-#: builtin/log.c:1477
-msgid "dir"
-msgstr "каталог"
+#: builtin/branch.c:640
+msgid "create the branch's reflog"
+msgstr "создать журнал ссылок ветки"
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
-#: builtin/commit-graph.c:132 builtin/commit-graph.c:185
-msgid "The object directory to store the graph"
-msgstr ""
+#: builtin/branch.c:642
+msgid "edit the description for the branch"
+msgstr "изменить описание ветки"
-#: builtin/commit-graph.c:134
-msgid "start walk at all refs"
-msgstr ""
+#: builtin/branch.c:643
+msgid "force creation, move/rename, deletion"
+msgstr "принудительное создание, перемещение или удаление ветки"
-#: builtin/commit-graph.c:136
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
+#: builtin/branch.c:644
+msgid "print only branches that are merged"
+msgstr "вывод только слитых веток"
-#: builtin/commit-graph.c:138
-msgid "start walk at commits listed by stdin"
-msgstr ""
+#: builtin/branch.c:645
+msgid "print only branches that are not merged"
+msgstr "вывод только не слитых веток"
-#: builtin/commit-graph.c:140
-msgid "include all commits already in the commit-graph file"
-msgstr ""
+#: builtin/branch.c:646
+msgid "list branches in columns"
+msgstr "показать список веток по столбцам"
-#: builtin/commit-graph.c:149
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
+#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:427
+msgid "object"
+msgstr "объект"
-#: builtin/config.c:10
-msgid "git config [<options>]"
-msgstr "git config [<опции>]"
+#: builtin/branch.c:650
+msgid "print only branches of the object"
+msgstr "вывод только веток, определенного объекта"
-#: builtin/config.c:101
-#, c-format
-msgid "unrecognized --type argument, %s"
-msgstr ""
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
+msgstr "сортировка и фильтрация не зависят от регистра"
-#: builtin/config.c:113
-msgid "only one type at a time"
-msgstr ""
+#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "использовать формат для вывода"
-#: builtin/config.c:122
-msgid "Config file location"
-msgstr "Размещение файла конфигурации"
+#: builtin/branch.c:676 builtin/clone.c:748
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD не найден в refs/heads!"
-#: builtin/config.c:123
-msgid "use global config file"
-msgstr "использовать глобальный файл конфигурации"
+#: builtin/branch.c:700
+msgid "--column and --verbose are incompatible"
+msgstr "--column и --verbose нельзя использовать одновременно"
-#: builtin/config.c:124
-msgid "use system config file"
-msgstr "использовать системный файл конфигурации"
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
+msgstr "требуется имя ветки"
-#: builtin/config.c:125
-msgid "use repository config file"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\84айл конÑ\84игÑ\83Ñ\80аÑ\86ии Ñ\80епозиÑ\82оÑ\80иÑ\8f"
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
+msgstr "Ð\9dелÑ\8cзÑ\8f даÑ\82Ñ\8c опиÑ\81ание оÑ\82делÑ\91нномÑ\83 HEAD"
-#: builtin/config.c:126
-msgid "use given config file"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\83казаннÑ\8bй Ñ\84айл конÑ\84игÑ\83Ñ\80аÑ\86ии"
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
+msgstr "нелÑ\8cзÑ\8f измениÑ\82Ñ\8c опиÑ\81ание более одной веÑ\82ки за Ñ\80аз"
-#: builtin/config.c:127
-msgid "blob-id"
-msgstr "идент-двоичн-объекта"
+#: builtin/branch.c:757
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/config.c:127
-msgid "read config from given blob object"
-msgstr "прочитать настройки из указанного двоичного объекта"
+#: builtin/branch.c:760
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Нет ветки с именем «%s»."
-#: builtin/config.c:128
-msgid "Action"
-msgstr "Действие"
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
+msgstr "слишком много веток для операции копирования"
-#: builtin/config.c:129
-msgid "get value: name [value-regex]"
-msgstr "получить значение: имя [шаблон-значений]"
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
+msgstr "слишком много аргументов для операции переименования"
-#: builtin/config.c:130
-msgid "get all values: key [value-regex]"
-msgstr "получить все значения: ключ [шаблон-значений]"
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
+msgstr "слишком много аргументов для указания новой вышестоящей ветки"
-#: builtin/config.c:131
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
+#: builtin/branch.c:793
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
-#: builtin/config.c:132
-msgid "get value specific for the URL: section[.var] URL"
-msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
+#: builtin/branch.c:796 builtin/branch.c:819
+#, c-format
+msgid "no such branch '%s'"
+msgstr "нет такой ветки «%s»"
-#: builtin/config.c:133
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
+#: builtin/branch.c:800
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "ветка «%s» не существует"
-#: builtin/config.c:134
-msgid "add a new variable: name value"
-msgstr "добавить новую переменную: имя значение"
+#: builtin/branch.c:813
+msgid "too many arguments to unset upstream"
+msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
-#: builtin/config.c:135
-msgid "remove a variable: name [value-regex]"
-msgstr "удалить переменную: имя [шаблон-значений]"
+#: builtin/branch.c:817
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
-#: builtin/config.c:136
-msgid "remove all matches: name [value-regex]"
-msgstr "удалить все совпадающие: имя [шаблон-значений]"
+#: builtin/branch.c:823
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
-#: builtin/config.c:137
-msgid "rename section: old-name new-name"
-msgstr "пеÑ\80еименоваÑ\82Ñ\8c Ñ\80аздел: Ñ\81Ñ\82аÑ\80ое-имÑ\8f новое-имÑ\8f"
+#: builtin/branch.c:833
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr "паÑ\80амеÑ\82Ñ\80Ñ\8b -a и -r длÑ\8f «git branch» не имеÑ\8eÑ\82 Ñ\81мÑ\8bÑ\81ла Ñ\81 Ñ\83казанием имени веÑ\82ки"
-#: builtin/config.c:138
-msgid "remove a section: name"
-msgstr "удалить раздел: имя"
+#: builtin/branch.c:836
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»"
-#: builtin/config.c:139
-msgid "list all"
-msgstr "показать весь список"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s в порядке\n"
-#: builtin/config.c:140
-msgid "open an editor"
-msgstr "оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c в Ñ\80едакÑ\82оÑ\80е"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "ТÑ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ий длÑ\8f Ñ\81озданиÑ\8f пакеÑ\82а."
-#: builtin/config.c:141
-msgid "find the color configured: slot [default]"
-msgstr "найÑ\82и наÑ\81Ñ\82Ñ\80оеннÑ\8bй Ñ\86веÑ\82: Ñ\80аздел [по-Ñ\83молÑ\87аниÑ\8e]"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "ТÑ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\80епозиÑ\82оÑ\80ий длÑ\8f Ñ\80аÑ\81паковки."
-#: builtin/config.c:142
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
+#: builtin/cat-file.c:593
+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/config.c:143
-msgid "Type"
-msgstr "Тип"
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
+"--filters]"
+msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-#: builtin/config.c:144
-msgid "value is given this type"
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/config.c:145
-msgid "value is \"true\" or \"false\""
-msgstr "значение — это «true» (правда) или «false» (ложь)"
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<тип> может быть одним из: blob, tree, commit, tag"
-#: builtin/config.c:146
-msgid "value is decimal number"
-msgstr "знаÑ\87ение â\80\94 Ñ\8dÑ\82о деÑ\81Ñ\8fÑ\82иÑ\87ное Ñ\87иÑ\81ло"
+#: builtin/cat-file.c:634
+msgid "show object type"
+msgstr "показаÑ\82Ñ\8c Ñ\82ип обÑ\8aекÑ\82а"
-#: builtin/config.c:147
-msgid "value is --bool or --int"
-msgstr "знаÑ\87ение â\80\94 Ñ\8dÑ\82о --bool или --int"
+#: builtin/cat-file.c:635
+msgid "show object size"
+msgstr "показаÑ\82Ñ\8c Ñ\80азмеÑ\80 обÑ\8aекÑ\82а"
-#: builtin/config.c:148
-msgid "value is a path (file or directory name)"
-msgstr "знаÑ\87ение â\80\94 Ñ\8dÑ\82о пÑ\83Ñ\82Ñ\8c (к Ñ\84айлÑ\83 или каÑ\82алогÑ\83)"
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
+msgstr "вÑ\8bйÑ\82и Ñ\81 нÑ\83левÑ\8bм кодом возвÑ\80аÑ\82а, еÑ\81ли неÑ\82 оÑ\88ибки"
-#: builtin/config.c:149
-msgid "value is an expiry date"
-msgstr "значение - это дата окончания срока действия"
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
+msgstr "структурированный вывод содержимого объекта"
-#: builtin/config.c:150
-msgid "Other"
-msgstr "Ð\94Ñ\80Ñ\83гое"
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
+msgstr "запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c texconv на Ñ\81одеÑ\80жимом двоиÑ\87нÑ\8bÑ\85 обÑ\8aекÑ\82ов "
-#: builtin/config.c:151
-msgid "terminate values with NUL byte"
-msgstr "завеÑ\80Ñ\88аÑ\82Ñ\8c знаÑ\87ениÑ\8f Ð\9dУÐ\9bÐ\95Ð\92ЫÐ\9c байÑ\82ом"
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
+msgstr "запÑ\83Ñ\81к Ñ\84илÑ\8cÑ\82Ñ\80ов на Ñ\81одеÑ\80жимом двоиÑ\87нÑ\8bÑ\85 обÑ\8aекÑ\82ов "
-#: builtin/config.c:152
-msgid "show variable names only"
-msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\82олÑ\8cко имена пеÑ\80еменнÑ\8bÑ\85"
+#: builtin/cat-file.c:643 git-submodule.sh:936
+msgid "blob"
+msgstr "двоиÑ\87нÑ\8bй обÑ\8aекÑ\82"
-#: builtin/config.c:153
-msgid "respect include directives on lookup"
-msgstr "учитывать директивы include (включения файлов) при запросе"
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
+msgstr "использовать определенный путь для --textconv/--filters"
-#: builtin/config.c:154
-msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "разрешить -s и -t работать с повреждёнными объектами"
-#: builtin/config.c:155
-msgid "value"
-msgstr ""
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
+msgstr "буфферировать вывод --batch"
-#: builtin/config.c:155
-msgid "with --get, use default value when missing entry"
-msgstr ""
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
+msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
-#: builtin/config.c:168
-#, c-format
-msgid "wrong number of arguments, should be %d"
-msgstr ""
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
+msgstr "показать информацию об объектах, переданных из стандартного ввода"
-#: builtin/config.c:170
-#, c-format
-msgid "wrong number of arguments, should be from %d to %d"
-msgstr ""
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
-#: builtin/config.c:304
-#, c-format
-msgid "invalid key pattern: %s"
-msgstr ""
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
+msgstr "показать все объекты с опциями --batch или --batch-check"
-#: builtin/config.c:340
-#, c-format
-msgid "failed to format default config value: %s"
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/config.c:397
-#, c-format
-msgid "cannot parse color '%s'"
-msgstr ""
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
-#: builtin/config.c:439
-msgid "unable to parse default color value"
-msgstr "не удалось разобрать значение цвета по умолчанию"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
-#: builtin/config.c:492 builtin/config.c:724
-msgid "not in a git directory"
-msgstr ""
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "вывести все атрибуты установленные для файла"
-#: builtin/config.c:495
-msgid "writing to stdin is not supported"
-msgstr ""
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "использовать только .gitattributes из индекса"
-#: builtin/config.c:498
-msgid "writing config blobs is not supported"
-msgstr ""
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "прочитать имена файлов из стандартного ввода"
-#: builtin/config.c:583
-#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
-msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
-#: builtin/config.c:606
-msgid "only one config file at a time"
-msgstr ""
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
+msgstr "не выводить прогресс выполнения"
-#: builtin/config.c:611
-msgid "--local can only be used inside a git repository"
-msgstr "--local можно использовать только внутри git репозитория"
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "показать не совпадающие введенные пути"
-#: builtin/config.c:614
-msgid "--blob can only be used inside a git repository"
-msgstr ""
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "игнорировать индекс при проверке"
-#: builtin/config.c:633
-msgid "$HOME not set"
-msgstr ""
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
+msgstr "нельзя указывать пути вместе с параметром --stdin"
-#: builtin/config.c:670
-msgid "--get-color and variable type are incoherent"
-msgstr ""
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr "-z имеет смысл только вместе с параметром --stdin"
-#: builtin/config.c:675
-msgid "only one action at a time"
-msgstr ""
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr "не указан путь"
-#: builtin/config.c:688
-msgid "--name-only is only applicable to --list or --get-regexp"
-msgstr ""
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet можно использовать только при указании одного пути"
-#: builtin/config.c:694
-msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
-"--list"
-msgstr ""
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr "нельзя использовать одновременно --quiet и --verbose"
-#: builtin/config.c:700
-msgid "--default is only applicable to --get"
-msgstr ""
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching можно использовать только вместе с --verbose"
-#: builtin/config.c:713
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<опции>] <контакт>…"
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "также читать контакты из стандартного ввода"
+
+#: builtin/check-mailmap.c:25
#, c-format
-msgid "unable to read config file '%s'"
-msgstr ""
+msgid "unable to parse contact: %s"
+msgstr "не удалось разобрать контакт: %s"
-#: builtin/config.c:716
-msgid "error processing config file(s)"
-msgstr ""
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "не указаны контакты"
-#: builtin/config.c:726
-msgid "editing stdin is not supported"
-msgstr ""
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<опции>] [--] [<файл>…]"
-#: builtin/config.c:728
-msgid "editing blobs is not supported"
-msgstr ""
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr "индекс должен быть между 1 и 3 или all"
-#: builtin/config.c:742
-#, c-format
-msgid "cannot create configuration file %s"
-msgstr "не удалось создать файл конфигурации %s"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr "переключиться на состояние всех файлов из индекса"
-#: builtin/config.c:755
-#, 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/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr "принудительная перезапись существующих файлов"
-#: builtin/config.c:829 builtin/config.c:840
-#, c-format
-msgid "no such section: %s"
-msgstr ""
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr "не создавать новые файлы"
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
-msgstr "вÑ\8bвод Ñ\80азмеÑ\80ов в Ñ\83добоÑ\87иÑ\82аемом длÑ\8f Ñ\87еловека виде"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr "обновиÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 доÑ\81Ñ\82Ñ\83па в Ñ\84айле индекÑ\81а"
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<опции>] [<указатель-коммита>…]"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr "прочитать список путей из стандартного ввода"
-#: builtin/describe.c:27
-msgid "git describe [<options>] --dirty"
-msgstr "git describe [<опции>] --dirty"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr "записать содержимое во временные файлы"
-#: builtin/describe.c:62
-msgid "head"
-msgstr "указатель на ветку"
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
+#: builtin/worktree.c:672
+msgid "string"
+msgstr "строка"
-#: builtin/describe.c:62
-msgid "lightweight"
-msgstr "легковеÑ\81нÑ\8bй"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr "добавиÑ\82Ñ\8c Ñ\81пеÑ\80еди <Ñ\81Ñ\82Ñ\80окÑ\83> пÑ\80и Ñ\81оздании Ñ\84айлов"
-#: builtin/describe.c:62
-msgid "annotated"
-msgstr "анноÑ\82иÑ\80ованнÑ\8bй"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr "копиÑ\80оваÑ\82Ñ\8c Ñ\84айлÑ\8b из Ñ\83казанного индекÑ\81а"
-#: builtin/describe.c:272
-#, c-format
-msgid "annotated tag %s not available"
-msgstr "аннотированная метка %s не доступна"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<опции>] <ветка>"
-#: builtin/describe.c:276
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "аннотированная метка %s не содержит встроенного названия"
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
-#: builtin/describe.c:278
+#: builtin/checkout.c:151 builtin/checkout.c:190
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "меÑ\82ка «%s» Ñ\83же здеÑ\81Ñ\8c «%s»"
+msgid "path '%s' does not have our version"
+msgstr "пÑ\83Ñ\82Ñ\8c «%s» не имееÑ\82 наÑ\88ей веÑ\80Ñ\81ии"
-#: builtin/describe.c:322
+#: builtin/checkout.c:153 builtin/checkout.c:192
#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr "неÑ\82 меÑ\82ок, Ñ\82оÑ\87но Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89иÑ\85 «%s»"
+msgid "path '%s' does not have their version"
+msgstr "пÑ\83Ñ\82Ñ\8c «%s» не имееÑ\82 иÑ\85 веÑ\80Ñ\81ии"
-#: builtin/describe.c:324
+#: builtin/checkout.c:169
#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
-msgstr "Ð\9dеÑ\82 Ñ\82оÑ\87нÑ\8bÑ\85 Ñ\81овпадений по Ñ\81Ñ\81Ñ\8bлкам или Ñ\82егам, иÑ\89Ñ\83 опиÑ\81аниÑ\8f\n"
+msgid "path '%s' does not have all necessary versions"
+msgstr "пÑ\83Ñ\82Ñ\8c «%s» не имееÑ\82 вÑ\81еÑ\85 необÑ\85одимÑ\8bÑ\85 веÑ\80Ñ\81ий"
-#: builtin/describe.c:378
+#: builtin/checkout.c:219
#, c-format
-msgid "finished search at %s\n"
-msgstr "поиск окончен на %s\n"
+msgid "path '%s' does not have necessary versions"
+msgstr "путь «%s» не имеет необходимых версий"
-#: builtin/describe.c:404
+#: builtin/checkout.c:237
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
+msgid "path '%s': cannot merge"
+msgstr "путь «%s»: не удалось слить"
-#: builtin/describe.c:408
+#: builtin/checkout.c:253
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
+msgid "Unable to add merge result for '%s'"
+msgstr "Не удалось добавить результат слияния «%s»"
-#: builtin/describe.c:438
+#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
+#: builtin/checkout.c:340
#, c-format
-msgid "traversed %lu commits\n"
-msgstr "посещено %lu коммитов\n"
+msgid "'%s' cannot be used with updating paths"
+msgstr "«%s» нельзя использовать при обновлении путей"
-#: builtin/describe.c:441
+#: builtin/checkout.c:343 builtin/checkout.c:346
#, 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"
+msgid "'%s' cannot be used with %s"
+msgstr "«%s» нельзя использовать одновременно с %s"
-#: builtin/describe.c:509
+#: builtin/checkout.c:349
#, c-format
-msgid "describe %s\n"
-msgstr "опиÑ\81аÑ\82Ñ\8c %s\n"
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "Ð\9dелÑ\8cзÑ\8f обновлÑ\8fÑ\82Ñ\8c пÑ\83Ñ\82и и пеÑ\80еклÑ\8eÑ\87аÑ\82Ñ\8cÑ\81Ñ\8f на веÑ\82кÑ\83 «%s» одновÑ\80еменно."
-#: builtin/describe.c:512 builtin/log.c:508
+#: builtin/checkout.c:396 builtin/checkout.c:403
#, c-format
-msgid "Not a valid object name %s"
-msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое имÑ\8f обÑ\8aекÑ\82а %s"
+msgid "path '%s' is unmerged"
+msgstr "пÑ\83Ñ\82Ñ\8c «%s» не Ñ\81лиÑ\82"
-#: builtin/describe.c:520
+#: builtin/checkout.c:442
#, c-format
-msgid "%s is neither a commit nor blob"
-msgstr "%s не является коммитом или двоичным объектом"
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: builtin/describe.c:534
-msgid "find the tag that comes after the commit"
-msgstr "поиск метки, которая идет после коммита"
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: builtin/describe.c:535
-msgid "debug search strategy on stderr"
-msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
+#: builtin/checkout.c:454
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: builtin/describe.c:536
-msgid "use any ref"
-msgstr "использовать любую ссылку"
+#: builtin/checkout.c:695
+msgid "you need to resolve your current index first"
+msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
-#: builtin/describe.c:537
-msgid "use any tag, even unannotated"
-msgstr "использовать любую метку, даже неаннотированную"
+#: builtin/checkout.c:744
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
-#: builtin/describe.c:538
-msgid "always use long format"
-msgstr "всегда использовать длинный формат вывода"
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
-#: builtin/describe.c:539
-msgid "only follow first parent"
-msgstr "следовать только за первым родителем"
+#: builtin/checkout.c:848
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
-#: builtin/describe.c:542
-msgid "only output exact matches"
-msgstr "выводить только точные совпадения"
+#: builtin/checkout.c:890
+msgid "HEAD is now at"
+msgstr "HEAD сейчас на"
-#: builtin/describe.c:544
-msgid "consider <n> most recent tags (default: 10)"
-msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
+#: builtin/checkout.c:894 builtin/clone.c:701
+msgid "unable to update HEAD"
+msgstr "не удалось обновить HEAD"
-#: builtin/describe.c:546
-msgid "only consider tags matching <pattern>"
-msgstr "рассматривать только метки по <шаблону>"
+#: builtin/checkout.c:898
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Сброс ветки «%s»\n"
-#: builtin/describe.c:548
-msgid "do not consider tags matching <pattern>"
-msgstr "не учитывать метки, которые соответствуют <шаблону>"
+#: builtin/checkout.c:901
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Уже на «%s»\n"
-#: builtin/describe.c:550 builtin/name-rev.c:424
-msgid "show abbreviated commit object as fallback"
-msgstr "если не найдено, показать сокращенный номер редакции коммита"
+#: builtin/checkout.c:905
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Переключение и сброс ветки «%s»\n"
-#: builtin/describe.c:551 builtin/describe.c:554
-msgid "mark"
-msgstr "пометка"
+#: builtin/checkout.c:907 builtin/checkout.c:1283
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/describe.c:552
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)"
+#: builtin/checkout.c:909
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Переключено на ветку «%s»\n"
-#: builtin/describe.c:555
-msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
+#: builtin/checkout.c:960
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " … и еще %d.\n"
-#: builtin/describe.c:573
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long несовместимо с --abbrev=0"
+#: builtin/checkout.c:966
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] "Предупреждение: вы оставляете позади %d коммит не соединенную ни с одной из ваших веток:\n\n%s\n"
+msgstr[1] "Предупреждение: вы оставляете позади %d коммита не соединенные ни с одной из ваших веток:\n\n%s\n"
+msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
+msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-#: builtin/describe.c:602
-msgid "No names found, cannot describe anything."
-msgstr "Имена не найдены, не могу ничего описать."
+#: builtin/checkout.c:985
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
+msgstr[1] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
+msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
+msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-#: builtin/describe.c:652
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty несовместимо с указанием указателей коммитов"
+#: builtin/checkout.c:1017
+msgid "internal error in revision walk"
+msgstr "внутренняя ошибка при хождении по редакциям"
-#: builtin/describe.c:654
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken несовместимо с указанием указателей коммитов"
+#: builtin/checkout.c:1021
+msgid "Previous HEAD position was"
+msgstr "Предыдущая позиция HEAD была"
-#: builtin/diff.c:83
-#, c-format
-msgid "'%s': not a regular file or symlink"
-msgstr "«%s»: не является обычным файлом или символьной ссылкой"
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
+msgid "You are on a branch yet to be born"
+msgstr "Вы находитесь на еще не созданной ветке"
-#: builtin/diff.c:234
+#: builtin/checkout.c:1173
#, c-format
-msgid "invalid option: %s"
-msgstr "неправильный параметр: %s"
-
-#: builtin/diff.c:363
-msgid "Not a git repository"
-msgstr "Не найден git репозиторий"
+msgid "only one reference expected, %d given."
+msgstr "ожидается только одна ссылка, а передано %d."
-#: builtin/diff.c:407
+#: builtin/checkout.c:1209
#, c-format
-msgid "invalid object '%s' given."
-msgstr "передан неправильный объект «%s»."
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
-#: builtin/diff.c:416
+#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
#, c-format
-msgid "more than two blobs given: '%s'"
-msgstr "пеÑ\80едано болÑ\8cÑ\88е двÑ\83Ñ\85 двоиÑ\87нÑ\8bÑ\85 обÑ\8aекÑ\82ов: «%s»"
+msgid "invalid reference: %s"
+msgstr "непÑ\80авилÑ\8cнаÑ\8f Ñ\81Ñ\81Ñ\8bлка: %s"
-#: builtin/diff.c:421
+#: builtin/checkout.c:1251
#, c-format
-msgid "unhandled object '%s' given."
-msgstr "пеÑ\80едан необÑ\80абоÑ\82аннÑ\8bй обÑ\8aекÑ\82 «%s»."
+msgid "reference is not a tree: %s"
+msgstr "в деÑ\80еве неÑ\82 Ñ\82акой Ñ\81Ñ\81Ñ\8bлки: %s"
-#: builtin/difftool.c:30
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
+#: builtin/checkout.c:1292
+msgid "paths cannot be used with switching branches"
+msgstr "нельзя использовать пути при переключении веток"
-#: builtin/difftool.c:260
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
#, c-format
-msgid "failed: %d"
-msgstr "сбой: %d"
+msgid "'%s' cannot be used with switching branches"
+msgstr "нельзя использовать «%s» при переключении веток"
-#: builtin/difftool.c:302
+#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
+#: builtin/checkout.c:1318
#, c-format
-msgid "could not read symlink %s"
-msgstr "не удалось прочитать символьную ссылку %s"
+msgid "'%s' cannot be used with '%s'"
+msgstr "«%s» нельзя использовать одновременно с «%s»"
-#: builtin/difftool.c:304
+#: builtin/checkout.c:1323
#, c-format
-msgid "could not read symlink file %s"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\84айл Ñ\81имволÑ\8cной Ñ\81Ñ\81Ñ\8bлки %s"
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Ð\9dелÑ\8cзÑ\8f пеÑ\80еклÑ\8eÑ\87иÑ\82Ñ\8c веÑ\82кÑ\83 на не коммиÑ\82 «%s»"
-#: builtin/difftool.c:312
-#, c-format
-msgid "could not read object %s for symlink %s"
-msgstr "не удалось прочитать объект %s для символьной ссылки %s"
+#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
+#: builtin/worktree.c:494
+msgid "branch"
+msgstr "ветка"
-#: builtin/difftool.c:413
-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/checkout.c:1357
+msgid "create and checkout a new branch"
+msgstr "создать и переключиться на новую ветку"
-#: builtin/difftool.c:633
-#, c-format
-msgid "both files modified: '%s' and '%s'."
-msgstr "оба файла изменены: «%s» и «%s»."
+#: builtin/checkout.c:1359
+msgid "create/reset and checkout a branch"
+msgstr "создать/сбросить и перключиться на новую ветку"
-#: builtin/difftool.c:635
-msgid "working tree file has been left."
-msgstr "Ñ\80абоÑ\87ий каÑ\82алог бÑ\8bл покинÑ\83Ñ\82."
+#: builtin/checkout.c:1360
+msgid "create reflog for new branch"
+msgstr "Ñ\81оздаÑ\82Ñ\8c жÑ\83Ñ\80нал Ñ\81Ñ\81Ñ\8bлок длÑ\8f новой веÑ\82ки"
-#: builtin/difftool.c:646
-#, c-format
-msgid "temporary files exist in '%s'."
-msgstr "временные файлы уже находятся в «%s»."
+#: builtin/checkout.c:1361 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
+msgstr "отсоединить HEAD на указанном коммите"
-#: builtin/difftool.c:647
-msgid "you may want to cleanup or recover these."
-msgstr "возможно вы хотите их удалить или восстановить."
+#: builtin/checkout.c:1362
+msgid "set upstream info for new branch"
+msgstr "установить информацию о вышестоящей ветке для новой ветки"
-#: builtin/difftool.c:696
-msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c «diff.guitool» вмеÑ\81Ñ\82о «diff.tool»"
+#: builtin/checkout.c:1364
+msgid "new-branch"
+msgstr "новаÑ\8f-веÑ\82ка"
-#: builtin/difftool.c:698
-msgid "perform a full-directory diff"
-msgstr "вÑ\8bполниÑ\82Ñ\8c поÑ\84айловое Ñ\81Ñ\80авнение вÑ\81его каÑ\82алога"
+#: builtin/checkout.c:1364
+msgid "new unparented branch"
+msgstr "новаÑ\8f веÑ\82ка без Ñ\80одиÑ\82елей"
-#: builtin/difftool.c:700
-msgid "do not prompt before launching a diff tool"
-msgstr "не Ñ\81пÑ\80аÑ\88иваÑ\82Ñ\8c пеÑ\80ед запÑ\83Ñ\81ком Ñ\83Ñ\82илиÑ\82Ñ\8b Ñ\81Ñ\80авнениÑ\8f"
+#: builtin/checkout.c:1366
+msgid "checkout our version for unmerged files"
+msgstr "пеÑ\80еклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f на наÑ\88Ñ\83 веÑ\80Ñ\81иÑ\8e длÑ\8f не Ñ\81лиÑ\82Ñ\8bÑ\85 Ñ\84айлов"
-#: builtin/difftool.c:705
-msgid "use symlinks in dir-diff mode"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81имволÑ\8cнÑ\8bе Ñ\81Ñ\81Ñ\8bлки в Ñ\80ежиме Ñ\81Ñ\80авнениÑ\8f каÑ\82алога"
+#: builtin/checkout.c:1369
+msgid "checkout their version for unmerged files"
+msgstr "пеÑ\80еклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f на иÑ\85 веÑ\80Ñ\81иÑ\8e длÑ\8f не Ñ\81лиÑ\82Ñ\8bÑ\85 Ñ\84айлов"
-#: builtin/difftool.c:706
-msgid "tool"
-msgstr ""
+#: builtin/checkout.c:1371
+msgid "force checkout (throw away local modifications)"
+msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
-#: builtin/difftool.c:707
-msgid "use the specified diff tool"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\83казаннÑ\83Ñ\8e Ñ\83Ñ\82илиÑ\82Ñ\83 Ñ\81Ñ\80авнениÑ\8f"
+#: builtin/checkout.c:1373
+msgid "perform a 3-way merge with the new branch"
+msgstr "вÑ\8bполниÑ\82Ñ\8c Ñ\82Ñ\80еÑ\85Ñ\85одовое Ñ\81лиÑ\8fние Ñ\81 новой веÑ\82кой"
-#: builtin/difftool.c:709
-msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок Ñ\83Ñ\82илиÑ\82, коÑ\82оÑ\80Ñ\8bе можно иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81 паÑ\80амеÑ\82Ñ\80ом «--tool»"
+#: builtin/checkout.c:1375 builtin/merge.c:284
+msgid "update ignored files (default)"
+msgstr "обновиÑ\82Ñ\8c игноÑ\80иÑ\80Ñ\83емÑ\8bе Ñ\84айлÑ\8b (по Ñ\83молÑ\87аниÑ\8e)"
-#: builtin/difftool.c:712
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
-" code"
-msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+msgid "style"
+msgstr "стиль"
-#: builtin/difftool.c:715
-msgid "specify a custom command for viewing diffs"
-msgstr "использовать особую команду для просмотра различий"
+#: builtin/checkout.c:1378
+msgid "conflict style (merge or diff3)"
+msgstr "стиль конфликтов слияния (merge или diff3)"
-#: builtin/difftool.c:739
-msgid "no <tool> given for --tool=<tool>"
-msgstr "не пеÑ\80едана <Ñ\83Ñ\82илиÑ\82а> длÑ\8f --tool=<Ñ\83Ñ\82илиÑ\82а>"
+#: builtin/checkout.c:1381
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "не огÑ\80аниÑ\87иваÑ\82Ñ\8c Ñ\81пеÑ\86иÑ\84икаÑ\82оÑ\80Ñ\8b пÑ\83Ñ\82и Ñ\82олÑ\8cко Ñ\87аÑ\81Ñ\82иÑ\87нÑ\8bми запиÑ\81Ñ\8fми"
-#: builtin/difftool.c:746
-msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "не передана <команда> для --extcmd=<команда>"
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr ""
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [опции-rev-list]"
+#: builtin/checkout.c:1385
+msgid "do not check if another worktree is holding the given ref"
+msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
-#: builtin/fast-export.c:1006
-msgid "show progress after <n> objects"
-msgstr "показать прогресс после <n> объектов"
+#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
+#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "принудительно выводить прогресс"
-#: builtin/fast-export.c:1008
-msgid "select handling of signed tags"
-msgstr "выбор обработки подписанных меток"
+#: builtin/checkout.c:1390
+msgid "use overlay mode (default)"
+msgstr ""
-#: builtin/fast-export.c:1011
-msgid "select handling of tags that tag filtered objects"
-msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
+#: builtin/checkout.c:1422
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b, -B и --orphan нельзя использовать одновременно"
-#: builtin/fast-export.c:1014
-msgid "Dump marks to this file"
-msgstr "Записать пометки в этот файл"
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
-#: builtin/fast-export.c:1016
-msgid "Import marks from this file"
-msgstr "Импортировать пометки из этого файла"
+#: builtin/checkout.c:1442
+msgid "--track needs a branch name"
+msgstr "--track требует имя ветки"
+
+#: builtin/checkout.c:1447
+msgid "missing branch name; try -b"
+msgstr "пропущено имя ветки; попробуйте -b"
+
+#: builtin/checkout.c:1484
+msgid "invalid path specification"
+msgstr "недопустимый спецификатор пути"
+
+#: builtin/checkout.c:1491
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
+
+#: builtin/checkout.c:1495
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
+
+#: builtin/checkout.c:1499
+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/checkout.c:1519
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:28
+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:32
+#, c-format
+msgid "Removing %s\n"
+msgstr "Удаление %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Будет удалено %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Пропуск репозитория %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Будет пропущен репозиторий %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr "сбой удаления %s"
+
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
+msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n"
+
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
+msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Хм (%s)?\n"
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Шаблоны игнорирования ввода>> "
+
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
+
+#: builtin/clean.c:719
+msgid "Select items to delete"
+msgstr "Укажите элементы для удаления"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Удалить %s [y - да/N - нет]? "
+
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr "До свидания.\n"
+
+#: builtin/clean.c:793
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению"
+
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr "*** Команды ***"
+
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
+msgstr "Что теперь"
+
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Удалить следующие элементы:"
+msgstr[1] "Удалить следующие элементы:"
+msgstr[2] "Удалить следующие элементы:"
+msgstr[3] "Удалить следующие элементы:"
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
+msgstr "Больше нет файлов для очистки, выходим."
+
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
+msgstr "не выводить имена удаляемых файлов"
+
+#: builtin/clean.c:909
+msgid "force"
+msgstr "принудительно"
+
+#: builtin/clean.c:910
+msgid "interactive cleaning"
+msgstr "интерактивная очистка"
+
+#: builtin/clean.c:912
+msgid "remove whole directories"
+msgstr "удалить каталоги полностью"
+
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "шаблон"
+
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
+msgstr "добавить <шаблон> в правила игнорирования"
+
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
+msgstr "также удалить игнорируемые файлы"
+
+#: builtin/clean.c:917
+msgid "remove only ignored files"
+msgstr "удалить только игнорируемые файлы"
+
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
+msgstr "нельзя использовать одновременно -x и -X"
+
+#: builtin/clean.c:939
+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:942
+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:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
+
+#: builtin/clone.c:90
+msgid "don't create a checkout"
+msgstr "не переключать рабочую копию на HEAD"
+
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr "создать голый репозиторий"
+
+#: builtin/clone.c:95
+msgid "create a mirror repository (implies bare)"
+msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
+
+#: builtin/clone.c:97
+msgid "to clone from a local repository"
+msgstr "для клонирования из локального репозитория"
+
+#: builtin/clone.c:99
+msgid "don't use local hardlinks, always copy"
+msgstr "не использовать жесткие ссылки, всегда копировать файлы"
+
+#: builtin/clone.c:101
+msgid "setup as shared repository"
+msgstr "настроить как общедоступный репозиторий"
+
+#: builtin/clone.c:104
+msgid "pathspec"
+msgstr "спецификатор-пути"
+
+#: builtin/clone.c:104
+msgid "initialize submodules in the clone"
+msgstr "инициализировать подмодули в клоне"
+
+#: builtin/clone.c:107
+msgid "number of submodules cloned in parallel"
+msgstr "количество подмодулей, которые будут клонированы парралельно"
+
+#: builtin/clone.c:108 builtin/init-db.c:486
+msgid "template-directory"
+msgstr "каталог-шаблонов"
+
+#: builtin/clone.c:109 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr "каталог, шаблоны из которого будут использованы"
+
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
+msgid "reference repository"
+msgstr "ссылаемый репозиторий"
+
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
+msgid "use --reference only while cloning"
+msgstr "используйте --reference только при клонировании"
+
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3306 builtin/repack.c:329
+msgid "name"
+msgstr "имя"
+
+#: builtin/clone.c:117
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
+
+#: builtin/clone.c:119
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
+
+#: builtin/clone.c:121
+msgid "path to git-upload-pack on the remote"
+msgstr "путь к git-upload-pack на внешнем репозитории"
+
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
+msgid "depth"
+msgstr "глубина"
+
+#: builtin/clone.c:123
+msgid "create a shallow clone of that depth"
+msgstr "сделать частичный клон указанной глубины"
+
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+msgid "time"
+msgstr "время"
+
+#: builtin/clone.c:125
+msgid "create a shallow clone since a specific time"
+msgstr "сделать частичный клон до определенного времени"
+
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
+msgid "revision"
+msgstr "редакция"
+
+#: builtin/clone.c:127 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "углубить историю частичного клона исключая редакцию"
+
+#: builtin/clone.c:129
+msgid "clone only one branch, HEAD or --branch"
+msgstr "клонировать только одну ветку, HEAD или --branch"
+
+#: builtin/clone.c:131
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
+
+#: builtin/clone.c:133
+msgid "any cloned submodules will be shallow"
+msgstr "все склонированные подмодули будут частичными клонами"
+
+#: builtin/clone.c:134 builtin/init-db.c:495
+msgid "gitdir"
+msgstr "каталог-git"
+
+#: builtin/clone.c:135 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr "разместить каталог git отдельно от рабочей копии"
+
+#: builtin/clone.c:136
+msgid "key=value"
+msgstr "ключ=значение"
+
+#: builtin/clone.c:137
+msgid "set config inside the new repository"
+msgstr "установить параметры внутри нового репозитория"
+
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
+msgstr "зависит-от-сервера"
+
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr "передаваемые опции"
+
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr "использовать только IPv4 адреса"
+
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr "использовать только IPv6 адреса"
+
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
+
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
+
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
+msgstr "не удалось открыть «%s»"
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s уже существует и не является каталогом"
+
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "не удалось выполнить stat %s\n"
+
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "сбой отсоединения «%s»"
+
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "не удалось создать ссылку «%s»"
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "не удалось копировать файл в «%s»"
+
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
+msgstr "готово.\n"
+
+#: builtin/clone.c:493
+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» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n"
+
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Не удалось найти внешнюю ветку %s для клонирования."
+
+#: builtin/clone.c:689
+#, c-format
+msgid "unable to update %s"
+msgstr "не удалось обновить %s"
+
+#: builtin/clone.c:739
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
+
+#: builtin/clone.c:770
+msgid "unable to checkout working tree"
+msgstr "не удалось переключиться на версию в рабочем каталоге"
+
+#: builtin/clone.c:815
+msgid "unable to write parameters to config file"
+msgstr "не удалось записать параметры в файл конфигурации"
+
+#: builtin/clone.c:878
+msgid "cannot repack to clean up"
+msgstr "не удалось выполнить перепаковку для очистки"
+
+#: builtin/clone.c:880
+msgid "cannot unlink temporary alternates file"
+msgstr "не удалось отсоединить временные альтернативные файлы"
+
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
+msgid "Too many arguments."
+msgstr "Слишком много аргументов."
+
+#: builtin/clone.c:924
+msgid "You must specify a repository to clone."
+msgstr "Вы должны указать репозиторий для клонирования."
+
+#: builtin/clone.c:937
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare и --origin %s нельзя использовать одновременно."
+
+#: builtin/clone.c:940
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
+
+#: builtin/clone.c:953
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "репозиторий «%s» не существует"
+
+#: builtin/clone.c:959 builtin/fetch.c:1610
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "глубина %s не является положительным числом"
+
+#: builtin/clone.c:969
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
+
+#: builtin/clone.c:979
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "рабочий каталог «%s» уже существует."
+
+#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
+#: builtin/worktree.c:296 builtin/worktree.c:328
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "не удалось создать родительские каталоги для «%s»"
+
+#: builtin/clone.c:999
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "не удалось создать рабочий каталог «%s»"
+
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Клонирование в голый репозиторий «%s»…\n"
+
+#: builtin/clone.c:1021
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Клонирование в «%s»…\n"
+
+#: builtin/clone.c:1045
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
+msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
+
+#: builtin/clone.c:1106
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
+
+#: builtin/clone.c:1108
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
+
+#: builtin/clone.c:1110
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
+
+#: builtin/clone.c:1112
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1115
+msgid "source repository is shallow, ignoring --local"
+msgstr "исходный репозиторий является частичным, --local игнорируется"
+
+#: builtin/clone.c:1120
+msgid "--local is ignored"
+msgstr "--local игнорируется"
+
+#: builtin/clone.c:1197 builtin/clone.c:1205
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
+
+#: builtin/clone.c:1208
+msgid "You appear to have cloned an empty repository."
+msgstr "Похоже, что вы клонировали пустой репозиторий."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<опции>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "запросить переменные конфигурации"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "использовать схему расположения"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "Максимальная ширина"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "Расстояние отступа слева"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "Расстояние отступа справа"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "Расстояние отступа между колонками"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "параметр --command должен быть первым"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#, c-format
+msgid "not a valid object name %s"
+msgstr ""
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr ""
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr ""
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
+#: builtin/tag.c:406
+msgid "message"
+msgstr "сообщение"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1480
+msgid "commit message"
+msgstr "сообщение коммита"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr ""
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
+#: builtin/pull.c:193 builtin/revert.c:117
+msgid "GPG sign commit"
+msgstr "подписать коммит с помощью GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr ""
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<опции>] [--] <спецификатор-пути>…"
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<опции>] [--] <спецификатор-пути>…"
+
+#: builtin/commit.c:51
+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:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "В противном случае, используйте «git reset»\n"
+
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr "сбой распаковки объекта дерева HEAD"
+
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
+msgstr "не удалось создать временный индекс"
+
+#: builtin/commit.c:359
+msgid "interactive add failed"
+msgstr "сбой интерактивного добавления"
+
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
+msgstr "не удалось обновить временный индекс"
+
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
+msgstr "Сбой при обновлении основного кэша дерева"
+
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
+msgstr "не удалось записать файл new_index"
+
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
+msgstr "нельзя создать частичный коммит во время слияния."
+
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "нельзя создать частичный коммит во время копирования коммита."
+
+#: builtin/commit.c:462
+msgid "cannot read the index"
+msgstr "не удалось прочитать индекс"
+
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
+msgstr "не удалось записать временный файл индекса"
+
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "у коммита «%s» отсутствует автор в заголовке"
+
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "у коммита «%s» строка автора в неправильном формате"
+
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
+msgstr "параметр --author в неправильном формате"
+
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
+
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "не удалось запросить коммит %s"
+
+#: builtin/commit.c:703 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(чтение файла журнала из стандартного ввода)\n"
+
+#: builtin/commit.c:705
+msgid "could not read log from standard input"
+msgstr "не удалось прочитать файл журнала из стандартного ввода"
+
+#: builtin/commit.c:709
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "не удалось прочитать файл журнала «%s»"
+
+#: builtin/commit.c:740 builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
+msgstr "не удалось прочитать SQUASH_MSG"
+
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
+msgstr "не удалось прочитать MERGE_MSG"
+
+#: builtin/commit.c:807
+msgid "could not write commit template"
+msgstr "не удалось записать шаблон описания коммита"
+
+#: builtin/commit.c:826
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n"
+
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n"
+
+#: builtin/commit.c:844
+#, 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:852
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
+
+#: builtin/commit.c:869
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sАвтор: %.*s <%.*s>"
+
+#: builtin/commit.c:877
+#, c-format
+msgid "%sDate: %s"
+msgstr "%sДата: %s"
+
+#: builtin/commit.c:884
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sКоммитер: %.*s <%.*s>"
+
+#: builtin/commit.c:902
+msgid "Cannot read index"
+msgstr "Не удалось прочитать индекс"
+
+#: builtin/commit.c:969
+msgid "Error building trees"
+msgstr "Ошибка при построении деревьев"
+
+#: builtin/commit.c:983 builtin/tag.c:269
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
+
+#: builtin/commit.c:1027
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
+
+#: builtin/commit.c:1041
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
+
+#: builtin/commit.c:1059 builtin/commit.c:1284
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Неправильный режим неотслеживаемых файлов «%s»"
+
+#: builtin/commit.c:1097
+msgid "--long and -z are incompatible"
+msgstr "--long и -z нельзя использовать одновременно"
+
+#: builtin/commit.c:1130
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
+
+#: builtin/commit.c:1139
+msgid "You have nothing to amend."
+msgstr "Нечего исправлять."
+
+#: builtin/commit.c:1142
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Вы в процессе слияния — сейчас нельзя исправлять."
+
+#: builtin/commit.c:1144
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять."
+
+#: builtin/commit.c:1147
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Опции --squash и --fixup не могут использоваться одновременно"
+
+#: builtin/commit.c:1157
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
+
+#: builtin/commit.c:1159
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1167
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
+
+#: builtin/commit.c:1184
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
+
+#: builtin/commit.c:1186
+msgid "No paths with --include/--only does not make sense."
+msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
+
+#: builtin/commit.c:1192
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1319 builtin/commit.c:1503
+msgid "show status concisely"
+msgstr "кратко показать статус"
+
+#: builtin/commit.c:1321 builtin/commit.c:1505
+msgid "show branch information"
+msgstr "показать информацию о версии"
+
+#: builtin/commit.c:1323
+msgid "show stash information"
+msgstr "показать информацию о спрятанном"
+
+#: builtin/commit.c:1325 builtin/commit.c:1507
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1327
+msgid "version"
+msgstr "версия"
+
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
+msgid "machine-readable output"
+msgstr "машиночитаемый вывод"
+
+#: builtin/commit.c:1330 builtin/commit.c:1511
+msgid "show status in long format (default)"
+msgstr "показать статус в длинном формате (по умолчанию)"
+
+#: builtin/commit.c:1333 builtin/commit.c:1514
+msgid "terminate entries with NUL"
+msgstr "завершать записи НУЛЕВЫМ байтом"
+
+#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
+#: parse-options.h:331
+msgid "mode"
+msgstr "режим"
+
+#: builtin/commit.c:1336 builtin/commit.c:1517
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
+
+#: builtin/commit.c:1340
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)"
+
+#: builtin/commit.c:1342 parse-options.h:179
+msgid "when"
+msgstr "когда"
+
+#: builtin/commit.c:1343
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (изменённые), untracked (неотслеживаемые). (По умолчанию: all)"
+
+#: builtin/commit.c:1345
+msgid "list untracked files in columns"
+msgstr "показать неотслеживаемые файлы по столбцам"
+
+#: builtin/commit.c:1346
+msgid "do not detect renames"
+msgstr "не определять переименования"
+
+#: builtin/commit.c:1348
+msgid "detect renames, optionally set similarity index"
+msgstr "определять переименования, опционально устанавливать рейтинг сходства"
+
+#: builtin/commit.c:1368
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
+
+#: builtin/commit.c:1473
+msgid "suppress summary after successful commit"
+msgstr "не выводить сводку изменений после успешного коммита"
+
+#: builtin/commit.c:1474
+msgid "show diff in commit message template"
+msgstr "добавить список изменений в шаблон сообщения коммита"
+
+#: builtin/commit.c:1476
+msgid "Commit message options"
+msgstr "Опции сообщения коммита"
+
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+msgid "read message from file"
+msgstr "прочитать сообщение из файла"
+
+#: builtin/commit.c:1478
+msgid "author"
+msgstr "автор"
+
+#: builtin/commit.c:1478
+msgid "override author for commit"
+msgstr "подменить автора коммита"
+
+#: builtin/commit.c:1479 builtin/gc.c:539
+msgid "date"
+msgstr "дата"
+
+#: builtin/commit.c:1479
+msgid "override date for commit"
+msgstr "подменить дату коммита"
+
+#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
+#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+msgid "commit"
+msgstr "коммит"
+
+#: builtin/commit.c:1481
+msgid "reuse and edit message from specified commit"
+msgstr "использовать и отредактировать сообщение от указанного коммита"
+
+#: builtin/commit.c:1482
+msgid "reuse message from specified commit"
+msgstr "использовать сообщение указанного коммита"
+
+#: builtin/commit.c:1483
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
+
+#: builtin/commit.c:1484
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
+
+#: builtin/commit.c:1485
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
+
+#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
+#: builtin/pull.c:162 builtin/revert.c:109
+msgid "add Signed-off-by:"
+msgstr "добавить Signed-off-by:"
+
+#: builtin/commit.c:1487
+msgid "use specified template file"
+msgstr "использовать указанный файл шаблона"
+
+#: builtin/commit.c:1488
+msgid "force edit of commit"
+msgstr "принудительно редактировать коммит"
+
+#: builtin/commit.c:1490
+msgid "include status in commit message template"
+msgstr "включить статус файлов в шаблон сообщения коммита"
+
+#: builtin/commit.c:1495
+msgid "Commit contents options"
+msgstr "Опции содержимого коммита"
+
+#: builtin/commit.c:1496
+msgid "commit all changed files"
+msgstr "закоммитить все измененные файлы"
+
+#: builtin/commit.c:1497
+msgid "add specified files to index for commit"
+msgstr "добавить указанные файлы в индекс для коммита"
+
+#: builtin/commit.c:1498
+msgid "interactively add files"
+msgstr "интерактивное добавление файлов"
+
+#: builtin/commit.c:1499
+msgid "interactively add changes"
+msgstr "интерактивное добавление изменений"
+
+#: builtin/commit.c:1500
+msgid "commit only specified files"
+msgstr "закоммитить только указанные файлы"
+
+#: builtin/commit.c:1501
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "пропустить перехватчик pre-commit и commit-msg"
+
+#: builtin/commit.c:1502
+msgid "show what would be committed"
+msgstr "показать, что будет закоммичено"
+
+#: builtin/commit.c:1515
+msgid "amend previous commit"
+msgstr "исправить предыдущий коммит"
+
+#: builtin/commit.c:1516
+msgid "bypass post-rewrite hook"
+msgstr "пропустить перехватчик post-rewrite"
+
+#: builtin/commit.c:1521
+msgid "ok to record an empty change"
+msgstr "разрешить запись пустого коммита"
+
+#: builtin/commit.c:1523
+msgid "ok to record a change with an empty message"
+msgstr "разрешить запись изменений с пустым сообщением"
+
+#: builtin/commit.c:1596
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Файл MERGE_HEAD поврежден (%s)"
+
+#: builtin/commit.c:1603
+msgid "could not read MERGE_MODE"
+msgstr "не удалось прочитать MERGE_MODE"
+
+#: builtin/commit.c:1622
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "не удалось открыть сообщение коммита: %s"
+
+#: builtin/commit.c:1629
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
+
+#: builtin/commit.c:1634
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Отмена коммита; вы не изменили сообщение.\n"
+
+#: builtin/commit.c:1668
+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/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr "git commit-graph [--object-dir <каталог-объектов>]"
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr "git commit-graph read [--object-dir <каталог-объектов>]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr "git commit-graph verify [--object-dir <каталог-объектов>]"
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable"
+"|--stdin-packs|--stdin-commits]"
+msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
+
+#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
+#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
+#: builtin/log.c:1561
+msgid "dir"
+msgstr "каталог"
+
+#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
+#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+msgid "The object directory to store the graph"
+msgstr "Каталог объектов для сохранения графа"
+
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Не удалось открыть файл commit-graph «%s»"
+
+#: builtin/commit-graph.c:150
+msgid "start walk at all refs"
+msgstr "начать со всех ссылок"
+
+#: builtin/commit-graph.c:152
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе"
+
+#: builtin/commit-graph.c:154
+msgid "start walk at commits listed by stdin"
+msgstr "начать с коммитов, перечисленных на стандартном вводе"
+
+#: builtin/commit-graph.c:156
+msgid "include all commits already in the commit-graph file"
+msgstr "включить все коммиты, которые уже есть в файле commit-graph"
+
+#: builtin/commit-graph.c:165
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<опции>]"
+
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr "Размещение файла конфигурации"
+
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr "использовать глобальный файл конфигурации"
+
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr "использовать системный файл конфигурации"
+
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr "использовать файл конфигурации репозитория"
+
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr "использовать указанный файл конфигурации"
+
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr "идент-двоичн-объекта"
+
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr "прочитать настройки из указанного двоичного объекта"
+
+#: builtin/config.c:131
+msgid "Action"
+msgstr "Действие"
+
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr "получить значение: имя [шаблон-значений]"
+
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr "получить все значения: ключ [шаблон-значений]"
+
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
+
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
+
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
+
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr "добавить новую переменную: имя значение"
+
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr "удалить переменную: имя [шаблон-значений]"
+
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr "удалить все совпадающие: имя [шаблон-значений]"
+
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr "переименовать раздел: старое-имя новое-имя"
+
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr "удалить раздел: имя"
+
+#: builtin/config.c:142
+msgid "list all"
+msgstr "показать весь список"
+
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr "открыть в редакторе"
+
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr "найти настроенный цвет: раздел [по-умолчанию]"
+
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
+
+#: builtin/config.c:146
+msgid "Type"
+msgstr "Тип"
+
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr "значение — это «true» (правда) или «false» (ложь)"
+
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr "значение — это десятичное число"
+
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr "значение — это --bool или --int"
+
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr "значение — это путь (к файлу или каталогу)"
+
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr "значение - это дата окончания срока действия"
+
+#: builtin/config.c:153
+msgid "Other"
+msgstr "Другое"
+
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr "завершать значения НУЛЕВЫМ байтом"
+
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr "показывать только имена переменных"
+
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr "учитывать директивы include (включения файлов) при запросе"
+
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
+
+#: builtin/config.c:158
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:443
+msgid "unable to parse default color value"
+msgstr "не удалось разобрать значение цвета по умолчанию"
+
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:587
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
+
+#: builtin/config.c:611
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
+msgstr "--local можно использовать только внутри git репозитория"
+
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:638
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:693
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
+"--list"
+msgstr ""
+
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:734
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "не удалось создать файл конфигурации %s"
+
+#: builtin/config.c:773
+#, 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/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "вывод размеров в удобочитаемом для человека виде"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<опции>] [<указатель-коммита>…]"
+
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<опции>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "указатель на ветку"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "легковесный"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "аннотированный"
+
+#: builtin/describe.c:273
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "аннотированная метка %s не доступна"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "аннотированная метка %s не содержит встроенного названия"
+
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "метка «%s» уже здесь «%s»"
+
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "нет меток, точно соответствующих «%s»"
+
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n"
+
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
+msgstr "поиск окончен на %s\n"
+
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
+
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
+
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "посещено %lu коммитов\n"
+
+#: builtin/describe.c:442
+#, 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:510
+#, c-format
+msgid "describe %s\n"
+msgstr "описать %s\n"
+
+#: builtin/describe.c:513
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Недопустимое имя объекта %s"
+
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s не является коммитом или двоичным объектом"
+
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
+msgstr "поиск метки, которая идет после коммита"
+
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
+msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
+
+#: builtin/describe.c:537
+msgid "use any ref"
+msgstr "использовать любую ссылку"
+
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
+msgstr "использовать любую метку, даже неаннотированную"
+
+#: builtin/describe.c:539
+msgid "always use long format"
+msgstr "всегда использовать длинный формат вывода"
+
+#: builtin/describe.c:540
+msgid "only follow first parent"
+msgstr "следовать только за первым родителем"
+
+#: builtin/describe.c:543
+msgid "only output exact matches"
+msgstr "выводить только точные совпадения"
+
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
+
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
+msgstr "рассматривать только метки по <шаблону>"
+
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
+msgstr "не учитывать метки, которые соответствуют <шаблону>"
+
+#: builtin/describe.c:551 builtin/name-rev.c:426
+msgid "show abbreviated commit object as fallback"
+msgstr "если не найдено, показать сокращенный номер редакции коммита"
+
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
+msgstr "пометка"
+
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)"
+
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
+
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long несовместимо с --abbrev=0"
+
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
+msgstr "Имена не найдены, не могу ничего описать."
+
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty несовместимо с указанием указателей коммитов"
+
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken несовместимо с указанием указателей коммитов"
+
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "«%s»: не является обычным файлом или символьной ссылкой"
+
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
+msgstr "неправильный параметр: %s"
+
+#: builtin/diff.c:350
+msgid "Not a git repository"
+msgstr "Не найден git репозиторий"
+
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "передан неправильный объект «%s»."
+
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "передано больше двух двоичных объектов: «%s»"
+
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "передан необработанный объект «%s»."
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
+
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
+msgstr "сбой: %d"
+
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
+msgstr "не удалось прочитать символьную ссылку %s"
+
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "не удалось прочитать файл символьной ссылки %s"
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "не удалось прочитать объект %s для символьной ссылки %s"
+
+#: builtin/difftool.c:406
+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:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "оба файла изменены: «%s» и «%s»."
+
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
+msgstr "рабочий каталог был покинут."
+
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "временные файлы уже находятся в «%s»."
+
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
+msgstr "возможно вы хотите их удалить или восстановить."
+
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "использовать «diff.guitool» вместо «diff.tool»"
+
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
+msgstr "выполнить пофайловое сравнение всего каталога"
+
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
+msgstr "не спрашивать перед запуском утилиты сравнения"
+
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
+msgstr "использовать символьные ссылки в режиме сравнения каталога"
+
+#: builtin/difftool.c:699
+msgid "tool"
+msgstr ""
+
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
+msgstr "использовать указанную утилиту сравнения"
+
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
+
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
+" code"
+msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
+
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
+msgstr "использовать особую команду для просмотра изменений"
+
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
+msgstr "не передана <утилита> для --tool=<утилита>"
+
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "не передана <команда> для --extcmd=<команда>"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [опции-rev-list]"
+
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
+msgstr "показать прогресс после <n> объектов"
+
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
+msgstr "выбор обработки подписанных меток"
+
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
+msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
+
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
+msgstr "Записать пометки в этот файл"
+
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
+msgstr "Импортировать пометки из этого файла"
+
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
+msgstr "Подделать автора метки, если у метки он отсутствует"
+
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
+msgstr "Вывести полное дерево для каждого коммита"
+
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
+msgstr "Использовать пометку завершения в конце потока"
+
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
+msgstr "Пропустить вывод данных двоичных объектов"
+
+#: builtin/fast-export.c:1102 builtin/log.c:1609
+msgid "refspec"
+msgstr "спецификатор ссылки"
+
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
+msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
+
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
+msgstr "сделать вывод анонимным"
+
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<опции>] <группа>"
+
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
+
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<опции>]"
+
+#: builtin/fetch.c:115 builtin/pull.c:202
+msgid "fetch from all remotes"
+msgstr "извлечь со всех внешних репозиториев"
+
+#: builtin/fetch.c:117 builtin/pull.c:205
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
+
+#: builtin/fetch.c:119 builtin/pull.c:208
+msgid "path to upload pack on remote end"
+msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
+
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr ""
+
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
+msgstr "извлечь с нескольких внешних репозиториев"
+
+#: builtin/fetch.c:124 builtin/pull.c:212
+msgid "fetch all tags and associated objects"
+msgstr "извлечь все метки и связанные объекты"
+
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
+msgstr "не извлекать все метки (--no-tags)"
+
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
+msgstr "количество подмодулей, которые будут скачаны парралельно"
+
+#: builtin/fetch.c:130 builtin/pull.c:215
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
+
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+msgid "on-demand"
+msgstr "по требованию"
+
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
+msgstr "управление рекурсивным извлечением подмодулей"
+
+#: builtin/fetch.c:138 builtin/pull.c:223
+msgid "keep downloaded pack"
+msgstr "оставить загруженный пакет данных"
+
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
+msgstr "разрешить обновление ссылки HEAD"
+
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+msgid "deepen history of shallow clone"
+msgstr "улугубить историю частичного клона"
+
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr "углубить историю частичного клона основываясь на времени"
+
+#: builtin/fetch.c:151 builtin/pull.c:229
+msgid "convert to a complete repository"
+msgstr "преобразовать в полный репозиторий"
+
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr "присоединять это спереди к выводу путей подмодуля"
+
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
+
+#: builtin/fetch.c:161 builtin/pull.c:232
+msgid "accept refs that update .git/shallow"
+msgstr "принимать ссылки, которые обновляют .git/shallow"
+
+#: builtin/fetch.c:162 builtin/pull.c:234
+msgid "refmap"
+msgstr "соответствие-ссылок"
+
+#: builtin/fetch.c:163 builtin/pull.c:235
+msgid "specify fetch refmap"
+msgstr "указать соответствие ссылок при извлечении"
+
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
+msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
+
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "опция fetch.output содержит неправильное значение для %s"
+
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
+msgstr "объект %s не найден"
+
+#: builtin/fetch.c:709
+msgid "[up to date]"
+msgstr "[актуально]"
+
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
+msgstr "[отклонено]"
+
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
+msgstr "нельзя извлечь текущую ветку"
+
+#: builtin/fetch.c:733
+msgid "[tag update]"
+msgstr "[обновление метки]"
+
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
+msgstr "не удалось обновить локальную ссылку"
+
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:760
+msgid "[new tag]"
+msgstr "[новая метка]"
+
+#: builtin/fetch.c:763
+msgid "[new branch]"
+msgstr "[новая ветка]"
+
+#: builtin/fetch.c:766
+msgid "[new ref]"
+msgstr "[новая ссылка]"
+
+#: builtin/fetch.c:796
+msgid "forced update"
+msgstr "принудительное обновление"
+
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
+msgstr "без перемотки вперед"
+
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s не отправил все необходимые объекты\n"
+
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
+
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
+msgstr "Из %.*s\n"
+
+#: builtin/fetch.c:970
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
+
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (%s будет висящей веткой)"
+
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " (%s стала висящей веткой)"
+
+#: builtin/fetch.c:1084
+msgid "[deleted]"
+msgstr "[удалено]"
+
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
+msgstr "(нет)"
+
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "Отказ получения в текущую ветку %s не голого репозитория"
+
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
+
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Параметр «%s» игнорируется для %s\n"
+
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Извлечение из %s\n"
+
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Не удалось извлечь %s"
+
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in "
+"extensions.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1506
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции."
+
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
+msgstr "Вам нужно указать имя метки."
+
+#: builtin/fetch.c:1594
+msgid "Negative depth in --deepen is not supported"
+msgstr "Отрицательная грубина для --deepen не поддерживается"
+
+#: builtin/fetch.c:1596
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen и --depth нельзя использовать одновременно"
+
+#: builtin/fetch.c:1601
+msgid "--depth and --unshallow cannot be used together"
+msgstr "нельзя использовать одновременно --depth и --unshallow"
+
+#: builtin/fetch.c:1603
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow не имеет смысла на полном репозитории"
+
+#: builtin/fetch.c:1619
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all не принимает имя репозитория как аргумент"
+
+#: builtin/fetch.c:1621
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
+
+#: builtin/fetch.c:1630
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Нет такого внешнего репозитория или группы: %s"
+
+#: builtin/fetch.c:1637
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
+
+#: builtin/fetch.c:1653
+msgid ""
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:18
+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:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "отправить в журнал <n> записей из короткого журнала"
+
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr "сокращение для --log (устаревшее)"
+
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr "текст"
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr "использовать <текст> как начальное сообщение"
+
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr "файл для чтения"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<опции>] [<шаблон>]"
+
+#: 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:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]"
+
+#: 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:28
+msgid "quote placeholders suitably for shells"
+msgstr "выводить указатели места заполнения в подходящем формате для командного процессора"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "выводить указатели места заполнения в подходящем формате для perl"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "выводить указатели места заполнения в подходящем формате для python"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "выводить указатели места заполнения в подходящем формате для Tcl"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "показать только <n> совпадающих ссылок"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
+msgid "respect format colors"
+msgstr "использовать цвета из формата"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "вывод только ссылок, которые указывают на переданный объект"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "вывод только слитых ссылок"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "вывод только не слитых ссылок"
-#: builtin/fast-export.c:1018
-msgid "Fake a tagger when tags lack one"
-msgstr "Ð\9fодделаÑ\82Ñ\8c авÑ\82оÑ\80а меÑ\82ки, еÑ\81ли Ñ\83 меÑ\82ки он оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83ет"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "вÑ\8bвод Ñ\82олÑ\8cко Ñ\81Ñ\81Ñ\8bлок, коÑ\82оÑ\80Ñ\8bе Ñ\81одеÑ\80жаÑ\82 коммит"
-#: builtin/fast-export.c:1020
-msgid "Output full tree for each commit"
-msgstr "Ð\92Ñ\8bвеÑ\81Ñ\82и полное деÑ\80ево длÑ\8f каждого коммиÑ\82а"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "вÑ\8bвод Ñ\82олÑ\8cко Ñ\81Ñ\81Ñ\8bлок, коÑ\82оÑ\80Ñ\8bе не Ñ\81одеÑ\80жаÑ\82 коммиÑ\82"
-#: builtin/fast-export.c:1022
-msgid "Use the done feature to terminate the stream"
-msgstr "Использовать пометку завершения в конце потока"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
-#: builtin/fast-export.c:1023
-msgid "Skip output of blob data"
-msgstr "Пропустить вывод данных двоичных объектов"
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
-#: builtin/fast-export.c:1024
-msgid "refspec"
-msgstr "спецификатор ссылки"
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
-#: builtin/fast-export.c:1025
-msgid "Apply refspec to exported refs"
-msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
-#: builtin/fast-export.c:1026
-msgid "anonymize output"
-msgstr "сделать вывод анонимным"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch [<options>] <group>"
-msgstr "git fetch [<опции>] <группа>"
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr ""
-#: builtin/fetch.c:29
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
-#: builtin/fetch.c:30
-msgid "git fetch --all [<options>]"
-msgstr "git fetch --all [<опции>]"
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
-#: builtin/fetch.c:112 builtin/pull.c:193
-msgid "fetch from all remotes"
-msgstr "извлечь со всех внешних репозиториев"
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:196
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr "не удалось закончить '%s'"
-#: builtin/fetch.c:116 builtin/pull.c:199
-msgid "path to upload pack on remote end"
-msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr ""
-#: builtin/fetch.c:117 builtin/pull.c:201
-msgid "force overwrite of local branch"
-msgstr "принудительная перезапись локальной ветки"
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
-#: builtin/fetch.c:119
-msgid "fetch from multiple remotes"
-msgstr "извлечь с нескольких внешних репозиториев"
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:203
-msgid "fetch all tags and associated objects"
-msgstr "извлечь все метки и связанные объекты"
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr ""
-#: builtin/fetch.c:123
-msgid "do not fetch all tags (--no-tags)"
-msgstr "не извлекать все метки (--no-tags)"
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr ""
-#: builtin/fetch.c:125
-msgid "number of submodules fetched in parallel"
-msgstr "количество подмодулей, которые будут скачаны парралельно"
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:206
-msgid "prune remote-tracking branches no longer on remote"
-msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
-#: builtin/fetch.c:129
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
-msgid "on-demand"
-msgstr "по требованию"
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
-#: builtin/fetch.c:131
-msgid "control recursive fetching of submodules"
-msgstr "управление рекурсивным извлечением подмодулей"
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "keep downloaded pack"
-msgstr "оставить загруженный пакет данных"
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:685
+msgid "Checking object directories"
+msgstr "Проверка каталогов объектов"
+
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:705 builtin/index-pack.c:841
+#, c-format
+msgid "invalid %s"
+msgstr "неправильный %s"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<опции>] [<объект>…]"
+
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
+msgstr "показать недоступные объекты"
+
+#: builtin/fsck.c:788
+msgid "show dangling objects"
+msgstr "показать объекты, на которые нет ссылок"
+
+#: builtin/fsck.c:789
+msgid "report tags"
+msgstr "вывести отчет по меткам"
+
+#: builtin/fsck.c:790
+msgid "report root nodes"
+msgstr "вывести отчет по корневым узлам"
+
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
+msgstr "воспринимать объекты в индексе как корневые узлы"
+
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
+msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
+
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
+msgstr "также проверять пакеты и альтернативные объекты"
+
+#: builtin/fsck.c:794
+msgid "check only connectivity"
+msgstr "только проверить соединение"
+
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
+msgstr "использовать более строгую проверку"
+
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
+msgstr "записать объекты на которые нет ссылок в .git/lost-found"
+
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
+msgstr "показать прогресс выполнения"
+
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
+msgstr "показать подробные имена для недоступных объектов"
+
+#: builtin/fsck.c:859 builtin/index-pack.c:224
+msgid "Checking objects"
+msgstr "Проверка объектов"
+
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr "git gc [<опции>]"
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Не удалось выполнить fstat %s: %s"
+
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "не удалось выполнить stat для «%s»"
+
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#, c-format
+msgid "cannot read '%s'"
+msgstr "не удалось прочитать «%s»"
+
+#: builtin/gc.c:492
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
+
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
+msgstr "почистить объекты, на которые нет ссылок"
+
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
+msgstr "проверять более внимательно (занимает больше времени)"
+
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
+msgstr "включить режим auto-gc"
+
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
+msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
+
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:566
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:577
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:597
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
+
+#: builtin/gc.c:599
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
+
+#: builtin/gc.c:600
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
+
+#: builtin/gc.c:640
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)"
-#: builtin/fetch.c:137
-msgid "allow updating of HEAD ref"
-msgstr "разрешить обновление ссылки HEAD"
+#: builtin/gc.c:693
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove "
+"them."
+msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
-#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
-msgid "deepen history of shallow clone"
-msgstr "улугубить историю частичного клона"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
-#: builtin/fetch.c:142
-msgid "deepen history of shallow repository based on time"
-msgstr "углубить историю частичного клона основываясь на времени"
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: сбой создания потока: %s"
-#: builtin/fetch.c:148 builtin/pull.c:220
-msgid "convert to a complete repository"
-msgstr "преобразовать в полный репозиторий"
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "указано недопустимое количество потоков (%d) для %s"
-#: builtin/fetch.c:151
-msgid "prepend this to submodule path output"
-msgstr "присоединять это спереди к выводу путей подмодуля"
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
+#: builtin/pack-objects.c:2720
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "нет поддержки потоков, игнорирование %s"
-#: builtin/fetch.c:154
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
-msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "не удалось прочитать дерево (%s)"
-#: builtin/fetch.c:158 builtin/pull.c:223
-msgid "accept refs that update .git/shallow"
-msgstr "принимать ссылки, которые обновляют .git/shallow"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "не удалось выполнить grep из объекта типа %s"
-#: builtin/fetch.c:159 builtin/pull.c:225
-msgid "refmap"
-msgstr "соответствие-ссылок"
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "параметр «%c» ожидает числовое значение"
-#: builtin/fetch.c:160 builtin/pull.c:226
-msgid "specify fetch refmap"
-msgstr "указать соответствие ссылок при извлечении"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
+msgstr "искать в индексе, а не в рабочем каталоге"
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
-msgstr "зависит-от-сервера"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
+msgstr "искать в содержимом не управляемым git"
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
-msgstr "передаваемые опции"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
+msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
-#: builtin/fetch.c:167
-msgid "report that we have only objects reachable from this object"
-msgstr ""
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
+msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/fetch.c:418
-msgid "Couldn't find remote ref HEAD"
-msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
+msgstr "рекурсивный поиск по всем подмодулям"
-#: builtin/fetch.c:552
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "опция fetch.output содержит неправильное значение для %s"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
+msgstr "искать в несовпадающих строках"
-#: builtin/fetch.c:645
-#, c-format
-msgid "object %s not found"
-msgstr "объект %s не найден"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
+msgstr "без учета регистра"
-#: builtin/fetch.c:649
-msgid "[up to date]"
-msgstr "[актуально]"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
+msgstr "искать совпадения шаблона только на границах слов"
-#: builtin/fetch.c:662 builtin/fetch.c:744
-msgid "[rejected]"
-msgstr "[отклонено]"
+#: builtin/grep.c:828
+msgid "process binary files as text"
+msgstr "обработка двоичных файлов как текста"
-#: builtin/fetch.c:663
-msgid "can't fetch in current branch"
-msgstr "нельзя извлечь текущую ветку"
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
+msgstr "не искать совпадения шаблона в двоичных файлах"
-#: builtin/fetch.c:672
-msgid "[tag update]"
-msgstr "[обновление метки]"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
+msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
-#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
-#: builtin/fetch.c:739
-msgid "unable to update local ref"
-msgstr "не удалось обновить локальную ссылку"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
+msgstr ""
-#: builtin/fetch.c:694
-msgid "[new tag]"
-msgstr "[новая метка]"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
+msgstr "на глубине максиму <глубина> уровней"
-#: builtin/fetch.c:697
-msgid "[new branch]"
-msgstr "[новая ветка]"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
+msgstr "использовать расширенные регулярные выражения POSIX"
-#: builtin/fetch.c:700
-msgid "[new ref]"
-msgstr "[новая ссылка]"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
+msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
-#: builtin/fetch.c:739
-msgid "forced update"
-msgstr "пÑ\80инÑ\83диÑ\82елÑ\8cное обновление"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
+msgstr "инÑ\82еÑ\80пÑ\80еÑ\82иÑ\80оваÑ\82Ñ\8c Ñ\88аблонÑ\8b как Ñ\84икÑ\81иÑ\80ованнÑ\8bе Ñ\81Ñ\82Ñ\80оки"
-#: builtin/fetch.c:744
-msgid "non-fast-forward"
-msgstr "без пеÑ\80емоÑ\82ки впеÑ\80ед"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Perl-Ñ\81овмеÑ\81Ñ\82имÑ\8bе Ñ\80егÑ\83лÑ\8fÑ\80нÑ\8bе вÑ\8bÑ\80ажениÑ\8f"
-#: builtin/fetch.c:790
-#, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr "%s не отправил все необходимые объекты\n"
+#: builtin/grep.c:853
+msgid "show line numbers"
+msgstr "вывести номера строк"
-#: builtin/fetch.c:811
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
+#: builtin/grep.c:854
+msgid "show column number of first match"
+msgstr ""
-#: builtin/fetch.c:900 builtin/fetch.c:1011
-#, c-format
-msgid "From %.*s\n"
-msgstr "Из %.*s\n"
+#: builtin/grep.c:855
+msgid "don't show filenames"
+msgstr "не выводить имена файлов"
-#: builtin/fetch.c:911
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
-msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
+#: builtin/grep.c:856
+msgid "show filenames"
+msgstr "выводить имена файлов"
-#: builtin/fetch.c:981
-#, c-format
-msgid " (%s will become dangling)"
-msgstr " (%s будет висящей веткой)"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
+msgstr "выводить имена файлов относительно каталога репозитория"
-#: builtin/fetch.c:982
-#, c-format
-msgid " (%s has become dangling)"
-msgstr " (%s стала висящей веткой)"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
+msgstr "выводить только имена файлов, а не совпадающие строки"
-#: builtin/fetch.c:1014
-msgid "[deleted]"
-msgstr "[удалено]"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
+msgstr "синоним для --files-with-matches"
-#: builtin/fetch.c:1015 builtin/remote.c:1035
-msgid "(none)"
-msgstr "(нет)"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
+msgstr "выводить только несовпадающие имена файлов"
-#: builtin/fetch.c:1038
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Отказ получения в текущую ветку %s не голого репозитория"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
+msgstr "выводить двоичный НОЛЬ после списка имен файлов"
-#: builtin/fetch.c:1057
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
+msgstr ""
-#: builtin/fetch.c:1060
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Параметр «%s» игнорируется для %s\n"
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
+msgstr "выводить количество совпадений, а не совпадающие строки"
-#: builtin/fetch.c:1339
-#, c-format
-msgid "Fetching %s\n"
-msgstr "Извлечение из %s\n"
+#: builtin/grep.c:873
+msgid "highlight matches"
+msgstr "подсвечивать совпадения"
-#: builtin/fetch.c:1341 builtin/remote.c:99
-#, c-format
-msgid "Could not fetch %s"
-msgstr "Не удалось извлечь %s"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
+msgstr "выводить пустую строку после совпадений из разных файлов"
-#: builtin/fetch.c:1387 builtin/fetch.c:1555
-msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
-msgstr ""
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
+msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
-#: builtin/fetch.c:1410
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции."
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
+msgstr "показать <n> строк контекста перед и после совпадения"
-#: builtin/fetch.c:1447
-msgid "You need to specify a tag name."
-msgstr "Ð\92ам нÑ\83жно Ñ\83казаÑ\82Ñ\8c имÑ\8f меÑ\82ки."
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
+msgstr "показаÑ\82Ñ\8c <n> Ñ\81Ñ\82Ñ\80ок конÑ\82екÑ\81Ñ\82а пеÑ\80ед Ñ\81овпадением"
-#: builtin/fetch.c:1496
-msgid "Negative depth in --deepen is not supported"
-msgstr "Ð\9eÑ\82Ñ\80иÑ\86аÑ\82елÑ\8cнаÑ\8f гÑ\80Ñ\83бина длÑ\8f --deepen не поддеÑ\80живаеÑ\82Ñ\81я"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
+msgstr "показаÑ\82Ñ\8c <n> Ñ\81Ñ\82Ñ\80ок конÑ\82екÑ\81Ñ\82а поÑ\81ле Ñ\81овпадения"
-#: builtin/fetch.c:1498
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen и --depth нельзя использовать одновременно"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
+msgstr "использовать <кол> рабочих потоков"
-#: builtin/fetch.c:1503
-msgid "--depth and --unshallow cannot be used together"
-msgstr "нельзя использовать одновременно --depth и --unshallow"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
+msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/fetch.c:1505
-msgid "--unshallow on a complete repository does not make sense"
-msgstr "--unshallow не имеет смысла на полном репозитории"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
+msgstr "показать строку с именем функции перед совпадением"
-#: builtin/fetch.c:1521
-msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all не принимает имя репозитория как аргумент"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
+msgstr "показать окружающую функцию"
-#: builtin/fetch.c:1523
-msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
+#: builtin/grep.c:896
+msgid "read patterns from file"
+msgstr "прочитать шаблоны из файла"
-#: builtin/fetch.c:1532
-#, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Нет такого внешнего репозитория или группы: %s"
+#: builtin/grep.c:898
+msgid "match <pattern>"
+msgstr "поиск соответствий с <шаблоном>"
-#: builtin/fetch.c:1539
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Ð\9fолÑ\83Ñ\87ение гÑ\80Ñ\83ппÑ\8b и Ñ\83казание Ñ\81пеÑ\86иÑ\84икаÑ\86ий Ñ\81Ñ\81Ñ\8bлок не имееÑ\82 Ñ\81мÑ\8bÑ\81ла"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
+msgstr "обÑ\8aединиÑ\82Ñ\8c Ñ\88аблонÑ\8b Ñ\83казаннÑ\8bе Ñ\81 помоÑ\89Ñ\8cÑ\8e -e"
-#: builtin/fmt-merge-msg.c:17
-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/grep.c:912
+msgid "indicate hit with exit status without output"
+msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
-#: builtin/fmt-merge-msg.c:671
-msgid "populate log with at most <n> entries from shortlog"
-msgstr "оÑ\82пÑ\80авиÑ\82Ñ\8c в жÑ\83Ñ\80нал <n> запиÑ\81ей из коÑ\80оÑ\82кого жÑ\83Ñ\80нала"
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
+msgstr "показаÑ\82Ñ\8c Ñ\82олÑ\8cко Ñ\81овпадениÑ\8f из Ñ\84айлов в коÑ\82оÑ\80Ñ\8bÑ\85 Ñ\81овпадаÑ\8eÑ\82 вÑ\81е Ñ\88аблонÑ\8b"
-#: builtin/fmt-merge-msg.c:674
-msgid "alias for --log (deprecated)"
-msgstr "сокращение для --log (устаревшее)"
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
+msgstr "показать дерево разбора для выражения поиска"
-#: builtin/fmt-merge-msg.c:677
-msgid "text"
-msgstr "текст"
+#: builtin/grep.c:920
+msgid "pager"
+msgstr "пейджер"
-#: builtin/fmt-merge-msg.c:678
-msgid "use <text> as start of message"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c <Ñ\82екÑ\81Ñ\82> как наÑ\87алÑ\8cное Ñ\81ообÑ\89ение"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
+msgstr "показаÑ\82Ñ\8c Ñ\81овпадаÑ\8eÑ\89ие Ñ\84айлÑ\8b Ñ\81 помоÑ\89Ñ\8cÑ\8e пÑ\80огÑ\80аммÑ\8b-пейджеÑ\80а"
-#: builtin/fmt-merge-msg.c:679
-msgid "file to read from"
-msgstr "Ñ\84айл длÑ\8f Ñ\87Ñ\82ениÑ\8f"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c вÑ\8bзов grep(1) (игноÑ\80иÑ\80Ñ\83еÑ\82Ñ\81Ñ\8f в Ñ\8dÑ\82ой Ñ\81боÑ\80ке)"
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr "git for-each-ref [<опции>] [<шаблон>]"
+#: builtin/grep.c:988
+msgid "no pattern given"
+msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
-msgstr "git for-each-ref [--points-at <объект>]"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]"
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "не удалось определить редакцию: %s"
-#: 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/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
-msgstr "вÑ\8bводиÑ\82Ñ\8c Ñ\83казаÑ\82ели меÑ\81Ñ\82а заполнениÑ\8f в подÑ\85одÑ\8fÑ\89ем Ñ\84оÑ\80маÑ\82е длÑ\8f командного пÑ\80оÑ\86еÑ\81Ñ\81оÑ\80а"
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
+msgstr "неÑ\82 поддеÑ\80жки поÑ\82оков, игноÑ\80иÑ\80ование --threads"
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
-msgstr "выводить указатели места заполнения в подходящем формате для perl"
+#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "указано неправильное количество потоков (%d)"
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
-msgstr "выводить указатели места заполнения в подходящем формате для python"
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
-msgstr "выводить указатели места заполнения в подходящем формате для Tcl"
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
+msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
-msgstr "показать только <n> совпадающих ссылок"
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:422
-msgid "respect format colors"
-msgstr "использовать цвета из формата"
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
-msgstr "вывод только ссылок, которые указывают на переданный объект"
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
+msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
-msgstr "вывод только слитых ссылок"
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
-msgstr "вывод только не слитых ссылок"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
-msgstr "вывод только ссылок, которые содержат коммит"
+#: builtin/hash-object.c:98
+msgid "type"
+msgstr "тип"
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
-msgstr "вывод только ссылок, которые не содержат коммит"
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "тип объекта"
-#: builtin/fsck.c:574
-msgid "Checking object directories"
-msgstr "Ð\9fÑ\80овеÑ\80ка каÑ\82алогов объектов"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "запиÑ\81Ñ\8c обÑ\8aекÑ\82а в базÑ\83 даннÑ\8bÑ\85 объектов"
-#: builtin/fsck.c:666
-msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<опции>] [<объект>…]"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "прочитать объект из стандартного ввода"
-#: builtin/fsck.c:672
-msgid "show unreachable objects"
-msgstr "показать недоступные объекты"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "сохранить файл без использования фильтров"
-#: builtin/fsck.c:673
-msgid "show dangling objects"
-msgstr "показать объекты, на которые нет ссылок"
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "хешировать любой мусор и создавать поврежденные объекты для отладки Git"
-#: builtin/fsck.c:674
-msgid "report tags"
-msgstr "вÑ\8bвеÑ\81Ñ\82и оÑ\82Ñ\87еÑ\82 по меÑ\82кам"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "обÑ\80абоÑ\82аÑ\82Ñ\8c Ñ\84айл Ñ\82ак, бÑ\83дÑ\82о он наÑ\85одиÑ\82Ñ\81Ñ\8f по Ñ\83казанномÑ\83 пÑ\83Ñ\82и"
-#: builtin/fsck.c:675
-msgid "report root nodes"
-msgstr "вывести отчет по корневым узлам"
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr "вывести список всех доступных команд"
-#: builtin/fsck.c:676
-msgid "make index objects head nodes"
-msgstr "воÑ\81пÑ\80инимаÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b в индекÑ\81е как коÑ\80невÑ\8bе Ñ\83злÑ\8b"
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr "иÑ\81клÑ\8eÑ\87иÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82ва"
-#: builtin/fsck.c:677
-msgid "make reflogs head nodes (default)"
-msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr "вывести список полезных руководств"
-#: builtin/fsck.c:678
-msgid "also consider packs and alternate objects"
-msgstr "также проверять пакеты и альтернативные объекты"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
-#: builtin/fsck.c:679
-msgid "check only connectivity"
-msgstr "только проверить соединение"
+#: builtin/help.c:51
+msgid "show man page"
+msgstr "открыть руководство в формате man"
-#: builtin/fsck.c:680
-msgid "enable more strict checking"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c более Ñ\81Ñ\82Ñ\80огÑ\83Ñ\8e пÑ\80овеÑ\80кÑ\83"
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr "оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82во в веб-бÑ\80аÑ\83зеÑ\80е"
-#: builtin/fsck.c:682
-msgid "write dangling objects in .git/lost-found"
-msgstr "запиÑ\81аÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b на коÑ\82оÑ\80Ñ\8bе неÑ\82 Ñ\81Ñ\81Ñ\8bлок в .git/lost-found"
+#: builtin/help.c:54
+msgid "show info page"
+msgstr "оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82во в Ñ\84оÑ\80маÑ\82е info"
-#: builtin/fsck.c:683 builtin/prune.c:110
-msgid "show progress"
-msgstr "показать прогресс выполнения"
+#: builtin/help.c:56
+msgid "print command description"
+msgstr ""
-#: builtin/fsck.c:684
-msgid "show verbose names for reachable objects"
-msgstr "показать подробные имена для недоступных объектов"
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
-#: builtin/fsck.c:750
-msgid "Checking objects"
-msgstr "Проверка объектов"
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "неопознанный формат руководства «%s»"
-#: builtin/gc.c:34
-msgid "git gc [<options>]"
-msgstr "git gc [<опции>]"
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
+msgstr "Сбой при запуске emacsclient."
-#: builtin/gc.c:90
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
+msgstr "Сбой при определении версии emacsclient."
+
+#: builtin/help.c:125
#, c-format
-msgid "Failed to fstat %s: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c fstat %s: %s"
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "веÑ\80Ñ\81иÑ\8f emacsclient «%d» Ñ\81лиÑ\88ком Ñ\81Ñ\82аÑ\80аÑ\8f (< 22)."
-#: builtin/gc.c:455
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
-msgid "Can't stat %s"
-msgstr "Не удалось выполнить stat для %s"
+msgid "failed to exec '%s'"
+msgstr "сбой при запуске «%s»"
-#: builtin/gc.c:464
+#: builtin/help.c:221
#, c-format
msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
-msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
-#: builtin/gc.c:505
-msgid "prune unreferenced objects"
-msgstr "почистить объекты, на которые нет ссылок"
+#: builtin/help.c:233
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
-#: builtin/gc.c:507
-msgid "be more thorough (increased runtime)"
-msgstr "проверять более внимательно (занимает больше времени)"
+#: builtin/help.c:350
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "«%s»: неизвестная программа просмотра man."
-#: builtin/gc.c:508
-msgid "enable auto-gc mode"
-msgstr "вклÑ\8eÑ\87иÑ\82Ñ\8c Ñ\80ежим auto-gc"
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
+msgstr "пÑ\80огÑ\80амма пÑ\80оÑ\81моÑ\82Ñ\80а man не обÑ\80абоÑ\82ала запÑ\80оÑ\81"
-#: builtin/gc.c:511
-msgid "force running gc even if there may be another gc running"
-msgstr "пÑ\80инÑ\83диÑ\82елÑ\8cно запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c gc, даже еÑ\81Ñ\82Ñ\8c дÑ\80Ñ\83гаÑ\8f копиÑ\8f gc Ñ\83же запÑ\83Ñ\89ена"
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
+msgstr "пÑ\80огÑ\80амма пÑ\80оÑ\81моÑ\82Ñ\80а info не обÑ\80абоÑ\82ала запÑ\80оÑ\81"
-#: builtin/gc.c:514
-msgid "repack all other packs except the largest pack"
-msgstr ""
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» — это сокращение для «%s»"
-#: builtin/gc.c:531
+#: builtin/help.c:448 git.c:364
#, c-format
-msgid "failed to parse gc.logexpiry value %s"
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/gc.c:542
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
-msgid "failed to parse prune expiry value %s"
+msgid "usage: %s%s"
+msgstr "использование: %s%s"
+
+#: builtin/help.c:491
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/gc.c:562
+#: builtin/index-pack.c:184
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81каÑ\8f Ñ\83паковка Ñ\80епозиÑ\82оÑ\80иÑ\8f в Ñ\84оне, длÑ\8f опÑ\82ималÑ\8cной пÑ\80оизводиÑ\82елÑ\8cноÑ\81Ñ\82и.\n"
+msgid "object type mismatch at %s"
+msgstr "неÑ\81ооÑ\82веÑ\82Ñ\81Ñ\82вие Ñ\82ипа обÑ\8aекÑ\82а на %s"
-#: builtin/gc.c:564
+#: builtin/index-pack.c:204
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81каÑ\8f Ñ\83паковка Ñ\80епозиÑ\82оÑ\80иÑ\8f, длÑ\8f опÑ\82ималÑ\8cной пÑ\80оизводиÑ\82елÑ\8cноÑ\81Ñ\82и.\n"
+msgid "did not receive expected object %s"
+msgstr "ожидаемÑ\8bй обÑ\8aекÑ\82 не полÑ\83Ñ\87ен на %s"
-#: builtin/gc.c:565
+#: builtin/index-pack.c:207
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "СмоÑ\82Ñ\80иÑ\82е «git help gc» Ñ\80Ñ\83ководÑ\81Ñ\82ва по Ñ\80Ñ\83Ñ\87ной оÑ\87иÑ\81Ñ\82ке.\n"
+msgid "object %s: expected type %s, found %s"
+msgstr "обÑ\8aекÑ\82 %s: ожидаемÑ\8bй Ñ\82ип %s, полÑ\83Ñ\87ен %s"
-#: builtin/gc.c:601
+#: builtin/index-pack.c:257
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)"
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "не удалось заполнить %d байт"
+msgstr[1] "не удалось заполнить %d байта"
+msgstr[2] "не удалось заполнить %d байтов"
+msgstr[3] "не удалось заполнить %d байтов"
-#: builtin/gc.c:652
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove "
-"them."
-msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
+#: builtin/index-pack.c:267
+msgid "early EOF"
+msgstr "неожиданный конец файла"
+
+#: builtin/index-pack.c:268
+msgid "read error on input"
+msgstr "ошибка чтения ввода"
+
+#: builtin/index-pack.c:280
+msgid "used more bytes than were available"
+msgstr "использовано больше байт, чем было доступно"
+
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+msgid "pack too large for current definition of off_t"
+msgstr "пакет слишком большой для текущего определения off_t"
+
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr "размер пакета превышает максимальный допустимый"
-#: builtin/grep.c:28
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
+#: builtin/index-pack.c:305 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "не удалось создать «%s»"
-#: builtin/grep.c:226
+#: builtin/index-pack.c:311
#, c-format
-msgid "grep: failed to create thread: %s"
-msgstr "grep: сбой создания потока: %s"
+msgid "cannot open packfile '%s'"
+msgstr "не удалось открыть файл пакета «%s»"
+
+#: builtin/index-pack.c:325
+msgid "pack signature mismatch"
+msgstr "несоответствие подписи пакета"
-#: builtin/grep.c:284
+#: builtin/index-pack.c:327
#, c-format
-msgid "invalid number of threads specified (%d) for %s"
-msgstr "указано недопустимое количество потоков (%d) для %s"
+msgid "pack version %<PRIu32> unsupported"
+msgstr "версия пакета %<PRIu32> не поддерживается"
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
-#: builtin/pack-objects.c:2639
+#: builtin/index-pack.c:345
#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "неÑ\82 поддеÑ\80жки поÑ\82оков, игноÑ\80иÑ\80ование %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "пакеÑ\82 Ñ\81одеÑ\80жиÑ\82 плоÑ\85ой обÑ\8aекÑ\82 по Ñ\81меÑ\89ениÑ\8e %<PRIuMAX>: %s"
-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
+#: builtin/index-pack.c:465
#, c-format
-msgid "unable to read tree (%s)"
-msgstr "не удалось прочитать дерево (%s)"
+msgid "inflate returned %d"
+msgstr "программа сжатия вернула %d"
+
+#: builtin/index-pack.c:514
+msgid "offset value overflow for delta base object"
+msgstr "переполнение значения смещения у базового объекта дельты"
-#: builtin/grep.c:638
+#: builtin/index-pack.c:522
+msgid "delta base offset is out of bound"
+msgstr "смещение базовой дельты вышло за допустимые пределы"
+
+#: builtin/index-pack.c:530
#, c-format
-msgid "unable to grep from object of type %s"
-msgstr "не удалось выполнить grep из объекта типа %s"
+msgid "unknown object type %d"
+msgstr "неизвестный тип объекта %d"
+
+#: builtin/index-pack.c:561
+msgid "cannot pread pack file"
+msgstr "не удалось выполнить pread для файла пакета"
-#: builtin/grep.c:704
+#: builtin/index-pack.c:563
#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr "параметр «%c» ожидает числовое значение"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] "преждевременное окончание файла пакета, %<PRIuMAX> байт отсутствует"
+msgstr[1] "преждевременное окончание файла пакета, %<PRIuMAX> байта отсутствует"
+msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
+msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-#: builtin/grep.c:791
-msgid "search in index instead of in the work tree"
-msgstr "искать в индексе, а не в рабочем каталоге"
+#: builtin/index-pack.c:589
+msgid "serious inflate inconsistency"
+msgstr "серьезное несоответствие при распаковке"
-#: builtin/grep.c:793
-msgid "find in contents not managed by git"
-msgstr "искать в содержимом не управляемым git"
+#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
+#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
-#: builtin/grep.c:795
-msgid "search in both tracked and untracked files"
-msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
+#: builtin/index-pack.c:737 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#, c-format
+msgid "unable to read %s"
+msgstr "не удалось прочитать %s"
-#: builtin/grep.c:797
-msgid "ignore files specified via '.gitignore'"
-msgstr "игнорировать файлы указанные в «.gitignore»"
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "не удалось прочитать информацию существующего объекта %s"
-#: builtin/grep.c:799
-msgid "recursively search in each submodule"
-msgstr "рекурсивный поиск по всем подмодулям"
+#: builtin/index-pack.c:808
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "не удалось прочитать существующий объект %s"
-#: builtin/grep.c:802
-msgid "show non-matching lines"
-msgstr "искать в несовпадающих строках"
+#: builtin/index-pack.c:822
+#, c-format
+msgid "invalid blob object %s"
+msgstr "неправильный файл двоичного объекта %s"
-#: builtin/grep.c:804
-msgid "case insensitive matching"
-msgstr "без учета регистра"
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
+msgid "fsck error in packed object"
+msgstr ""
-#: builtin/grep.c:806
-msgid "match patterns only at word boundaries"
-msgstr "искать совпадения шаблона только на границах слов"
+#: builtin/index-pack.c:846
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Не все дочерние объекты %s достижимы"
-#: builtin/grep.c:808
-msgid "process binary files as text"
-msgstr "обработка двоичных файлов как текста"
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
+msgid "failed to apply delta"
+msgstr "сбой при применении дельты"
-#: builtin/grep.c:810
-msgid "don't match patterns in binary files"
-msgstr "не иÑ\81каÑ\82Ñ\8c Ñ\81овпадениÑ\8f Ñ\88аблона в двоиÑ\87нÑ\8bÑ\85 Ñ\84айлаÑ\85"
+#: builtin/index-pack.c:1117
+msgid "Receiving objects"
+msgstr "Ð\9fолÑ\83Ñ\87ение обÑ\8aекÑ\82ов"
-#: builtin/grep.c:813
-msgid "process binary files with textconv filters"
-msgstr "обÑ\80абаÑ\82Ñ\8bваÑ\82Ñ\8cÑ\81Ñ\8f двоиÑ\87нÑ\8bе Ñ\84айлÑ\8b Ñ\81 помоÑ\89Ñ\8cÑ\8e Ñ\84илÑ\8cÑ\82Ñ\80ов textconv"
+#: builtin/index-pack.c:1117
+msgid "Indexing objects"
+msgstr "Ð\98ндекÑ\81иÑ\80ование обÑ\8aекÑ\82ов"
-#: builtin/grep.c:815
-msgid "descend at most <depth> levels"
-msgstr "на глÑ\83бине макÑ\81имÑ\83 <глÑ\83бина> Ñ\83Ñ\80овней"
+#: builtin/index-pack.c:1151
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "пакеÑ\82 повÑ\80ежден (неÑ\81ооÑ\82веÑ\82Ñ\81Ñ\82вие SHA1)"
-#: builtin/grep.c:819
-msgid "use extended POSIX regular expressions"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\80аÑ\81Ñ\88иÑ\80еннÑ\8bе Ñ\80егÑ\83лÑ\8fÑ\80нÑ\8bе вÑ\8bÑ\80ажениÑ\8f POSIX"
+#: builtin/index-pack.c:1156
+msgid "cannot fstat packfile"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c fstat длÑ\8f Ñ\84айла пакеÑ\82а"
-#: builtin/grep.c:822
-msgid "use basic POSIX regular expressions (default)"
-msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
+#: builtin/index-pack.c:1159
+msgid "pack has junk at the end"
+msgstr "файл пакета содержит мусор в конце"
-#: builtin/grep.c:825
-msgid "interpret patterns as fixed strings"
-msgstr "инÑ\82еÑ\80пÑ\80еÑ\82иÑ\80оваÑ\82Ñ\8c Ñ\88аблонÑ\8b как Ñ\84икÑ\81иÑ\80ованнÑ\8bе Ñ\81Ñ\82Ñ\80оки"
+#: builtin/index-pack.c:1171
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "безÑ\83мнаÑ\8f пÑ\83Ñ\82аниÑ\86а в parse_pack_objects()"
-#: builtin/grep.c:828
-msgid "use Perl-compatible regular expressions"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Perl-Ñ\81овмеÑ\81Ñ\82имÑ\8bе Ñ\80егÑ\83лÑ\8fÑ\80нÑ\8bе вÑ\8bÑ\80ажениÑ\8f"
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
+msgstr "Ð\9eпÑ\80еделение изменений"
-#: builtin/grep.c:831
-msgid "show line numbers"
-msgstr "вывести номера строк"
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "не удалось создать поток: %s"
-#: builtin/grep.c:832
-msgid "show column number of first match"
-msgstr ""
+#: builtin/index-pack.c:1245
+msgid "confusion beyond insanity"
+msgstr "безумная путаница"
-#: builtin/grep.c:833
-msgid "don't show filenames"
-msgstr "не выводить имена файлов"
+#: builtin/index-pack.c:1251
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "завершено с %d локальным объектом"
+msgstr[1] "завершено с %d локальными объектами"
+msgstr[2] "завершено с %d локальными объектами"
+msgstr[3] "завершено с %d локальными объектами"
-#: builtin/grep.c:834
-msgid "show filenames"
-msgstr "выводить имена файлов"
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
-#: builtin/grep.c:836
-msgid "show filenames relative to top directory"
-msgstr "выводить имена файлов относительно каталога репозитория"
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "пакет содержит %d неразрешенную дельту"
+msgstr[1] "пакет содержит %d неразрешенные дельты"
+msgstr[2] "пакет содержит %d неразрешенных дельт"
+msgstr[3] "пакет содержит %d неразрешенных дельт"
-#: builtin/grep.c:838
-msgid "show only filenames instead of matching lines"
-msgstr "выводить только имена файлов, а не совпадающие строки"
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "нельзя сжать присоединенный объект (%d)"
-#: builtin/grep.c:840
-msgid "synonym for --files-with-matches"
-msgstr "синоним для --files-with-matches"
+#: builtin/index-pack.c:1368
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "локальный объект %s поврежден"
-#: builtin/grep.c:843
-msgid "show only the names of files without match"
-msgstr "выводить только несовпадающие имена файлов"
+#: builtin/index-pack.c:1382
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "имя пакета «%s» не оканчивается на «.pack»"
-#: builtin/grep.c:845
-msgid "print NUL after filenames"
-msgstr "выводить двоичный НОЛЬ после списка имен файлов"
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr ""
-#: builtin/grep.c:848
-msgid "show only matching parts of a line"
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/grep.c:850
-msgid "show the number of matches instead of matching lines"
-msgstr "вÑ\8bводиÑ\82Ñ\8c колиÑ\87еÑ\81Ñ\82во Ñ\81овпадений, а не Ñ\81овпадаÑ\8eÑ\89ие Ñ\81Ñ\82Ñ\80оки"
+#: builtin/index-pack.c:1439
+msgid "error while closing pack file"
+msgstr "оÑ\88ибка пÑ\80и закÑ\80Ñ\8bÑ\82ии Ñ\84айла пакеÑ\82а"
-#: builtin/grep.c:851
-msgid "highlight matches"
-msgstr "подÑ\81веÑ\87иваÑ\82Ñ\8c Ñ\81овпадениÑ\8f"
+#: builtin/index-pack.c:1453
+msgid "cannot store pack file"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ñ\84айл пакеÑ\82а"
-#: builtin/grep.c:853
-msgid "print empty line between matches from different files"
-msgstr "вÑ\8bводиÑ\82Ñ\8c пÑ\83Ñ\81Ñ\82Ñ\83Ñ\8e Ñ\81Ñ\82Ñ\80окÑ\83 поÑ\81ле Ñ\81овпадений из Ñ\80азнÑ\8bÑ\85 Ñ\84айлов"
+#: builtin/index-pack.c:1461
+msgid "cannot store index file"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ñ\84айл индекÑ\81а"
-#: builtin/grep.c:855
-msgid "show filename only once above matches from same file"
-msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "плохой pack.indexversion=%<PRIu32>"
-#: builtin/grep.c:858
-msgid "show <n> context lines before and after matches"
-msgstr "показать <n> строк контекста перед и после совпадения"
+#: builtin/index-pack.c:1573
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Не удалось открыть существующий файл пакета «%s»"
-#: builtin/grep.c:861
-msgid "show <n> context lines before matches"
-msgstr "показать <n> строк контекста перед совпадением"
+#: builtin/index-pack.c:1575
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "Не удалось открыть существующий файл индекса для «%s»"
-#: builtin/grep.c:863
-msgid "show <n> context lines after matches"
-msgstr "показать <n> строк контекста после совпадения"
+#: builtin/index-pack.c:1623
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "не дельты: %d объект"
+msgstr[1] "не дельты: %d объекта"
+msgstr[2] "не дельты: %d объектов"
+msgstr[3] "не дельты: %d объектов"
-#: builtin/grep.c:865
-msgid "use <n> worker threads"
-msgstr "использовать <кол> рабочих потоков"
+#: builtin/index-pack.c:1630
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "длина цепочки = %d: %lu объект"
+msgstr[1] "длина цепочки = %d: %lu объекта"
+msgstr[2] "длина цепочки = %d: %lu объектов"
+msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/grep.c:866
-msgid "shortcut for -C NUM"
-msgstr "тоже, что и -C КОЛИЧЕСТВО"
+#: builtin/index-pack.c:1667
+msgid "Cannot come back to cwd"
+msgstr "Не удалось вернуться в текущий рабочий каталог"
-#: builtin/grep.c:869
-msgid "show a line with the function name before matches"
-msgstr "показать строку с именем функции перед совпадением"
+#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#, c-format
+msgid "bad %s"
+msgstr "плохой %s"
-#: builtin/grep.c:871
-msgid "show the surrounding function"
-msgstr "показать окружающую функцию"
+#: builtin/index-pack.c:1755
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin нельзя использовать без --stdin"
-#: builtin/grep.c:874
-msgid "read patterns from file"
-msgstr "пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\88аблонÑ\8b из Ñ\84айла"
+#: builtin/index-pack.c:1757
+msgid "--stdin requires a git repository"
+msgstr "опÑ\86иÑ\8f --stdin Ñ\82Ñ\80ебÑ\83еÑ\82 налиÑ\87иÑ\8f Ñ\80епозиÑ\82оÑ\80иÑ\8f git"
-#: builtin/grep.c:876
-msgid "match <pattern>"
-msgstr "поиск соответствий с <шаблоном>"
+#: builtin/index-pack.c:1763
+msgid "--verify with no packfile name given"
+msgstr "--verify без указания имени файла пакета"
-#: builtin/grep.c:878
-msgid "combine patterns specified with -e"
-msgstr "объединить шаблоны указанные с помощью -e"
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr ""
-#: builtin/grep.c:890
-msgid "indicate hit with exit status without output"
-msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "не удалось выполнить stat для шаблона «%s»"
-#: builtin/grep.c:892
-msgid "show only matches from files that match all patterns"
-msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "не удалось выполнить opendir для «%s»"
-#: builtin/grep.c:894
-msgid "show parse tree for grep expression"
-msgstr "показать дерево разбора для выражения поиска"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "не удалось выполнить readlink для «%s»"
-#: builtin/grep.c:898
-msgid "pager"
-msgstr "пейджер"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "не удалось создать символьную ссылку «%s» на «%s»"
-#: builtin/grep.c:898
-msgid "show matching files in the pager"
-msgstr "показать совпадающие файлы с помощью программы-пейджера"
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "не удалось скопировать файл «%s» в «%s»"
-#: builtin/grep.c:902
-msgid "allow calling of grep(1) (ignored by this build)"
-msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr "игнорирование шаблона %s"
-#: builtin/grep.c:966
-msgid "no pattern given"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
msgstr ""
-#: builtin/grep.c:1002
-msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
-
-#: builtin/grep.c:1009
+#: builtin/init-db.c:136
#, c-format
-msgid "unable to resolve revision: %s"
-msgstr "не удалось определить редакцию: %s"
+msgid "not copying templates from '%s': %s"
+msgstr "не копирую шаблоны из «%s»: %s"
-#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
+#: builtin/init-db.c:334
#, c-format
-msgid "invalid number of threads specified (%d)"
-msgstr "указано неправильное количество потоков (%d)"
+msgid "unable to handle file type %d"
+msgstr "не удается обработать файл типа %d"
-#: builtin/grep.c:1049 builtin/pack-objects.c:3289
-msgid "no threads support, ignoring --threads"
-msgstr "нет поддержки потоков, игнорирование --threads"
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "не удается переместить файл %s в %s"
-#: builtin/grep.c:1073
-msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager работает только в рабочем каталоге"
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr "%s уже существует"
-#: builtin/grep.c:1096
-msgid "option not supported with --recurse-submodules"
-msgstr ""
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
-#: builtin/grep.c:1102
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr ""
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
-#: builtin/grep.c:1108
-msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr ""
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
-#: builtin/grep.c:1116
-msgid "both --cached and trees are given"
-msgstr ""
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Инициализирован пустой репозиторий Git в %s%s\n"
-#: builtin/hash-object.c:84
+#: builtin/init-db.c:468
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
-msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
+"[--shared[=<permissions>]] [<directory>]"
+msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
-#: builtin/hash-object.c:85
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr "права-доступа"
-#: builtin/hash-object.c:97
-msgid "type"
-msgstr "Ñ\82ип"
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "Ñ\83кажиÑ\82е, еÑ\81ли Ñ\80епозиÑ\82оÑ\80ий git бÑ\83деÑ\82 иÑ\81полÑ\8cзоваÑ\82Ñ\8cÑ\81Ñ\8f неÑ\81колÑ\8cкими полÑ\8cзоваÑ\82елÑ\8fми"
-#: builtin/hash-object.c:97
-msgid "object type"
-msgstr "тип объекта"
+#: builtin/init-db.c:526 builtin/init-db.c:531
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "не удалось выполнить mkdir %s"
-#: builtin/hash-object.c:98
-msgid "write the object into the object database"
-msgstr "запись объекта в базу данных объектов"
+#: builtin/init-db.c:535
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "не удалось выполнить chdir в %s"
-#: builtin/hash-object.c:100
-msgid "read the object from stdin"
-msgstr "прочитать объект из стандартного ввода"
+#: builtin/init-db.c:556
+#, 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/hash-object.c:102
-msgid "store file as is without filters"
-msgstr "сохранить файл без использования фильтров"
+#: builtin/init-db.c:584
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
-#: builtin/hash-object.c:103
+#: builtin/interpret-trailers.c:15
msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
-#: builtin/hash-object.c:104
-msgid "process file as it were from this path"
-msgstr "обработать файл так, будто он находится по указанному пути"
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr "редактировать файлы на месте"
-#: builtin/help.c:46
-msgid "print all available commands"
-msgstr "вывести список всех доступных команд"
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr "удалять пустые завершители"
-#: builtin/help.c:47
-msgid "exclude guides"
-msgstr "иÑ\81клÑ\8eÑ\87иÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82ва"
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr "где помеÑ\81Ñ\82иÑ\82Ñ\8c новÑ\8bй завеÑ\80Ñ\88иÑ\82елÑ\8c"
-#: builtin/help.c:48
-msgid "print list of useful guides"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок полезнÑ\8bÑ\85 Ñ\80Ñ\83ководÑ\81Ñ\82в"
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr "дейÑ\81Ñ\82вие, еÑ\81ли завеÑ\80Ñ\88иÑ\82елÑ\8c Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
-#: builtin/help.c:49
-msgid "print all configuration variable names"
-msgstr ""
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr "действие, если завершитель не существует"
-#: builtin/help.c:51
-msgid "show man page"
-msgstr "оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82во в Ñ\84оÑ\80маÑ\82е man"
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\82олÑ\8cко завеÑ\80Ñ\88иÑ\82ели"
-#: builtin/help.c:52
-msgid "show manual in web browser"
-msgstr "оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c Ñ\80Ñ\83ководÑ\81Ñ\82во в веб-бÑ\80аÑ\83зеÑ\80е"
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr "не пÑ\80именÑ\8fÑ\82Ñ\8c пÑ\80авила из Ñ\84айла конÑ\84игÑ\83Ñ\80аÑ\86ии"
-#: builtin/help.c:54
-msgid "show info page"
-msgstr "открыть руководство в формате info"
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr "объединить значения разделенные пробелом"
-#: builtin/help.c:56
-msgid "print command description"
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr "указание опций разбора"
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
msgstr ""
-#: builtin/help.c:61
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr "завершитель"
-#: builtin/help.c:73
-#, c-format
-msgid "unrecognized help format '%s'"
-msgstr "неопознанный формат руководства «%s»"
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr "завершители для добавления"
-#: builtin/help.c:100
-msgid "Failed to start emacsclient."
-msgstr "Сбой при запуске emacsclient."
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer одновременно с --only-input не имеет смысла"
-#: builtin/help.c:113
-msgid "Failed to parse emacsclient version."
-msgstr "Сбой пÑ\80и опÑ\80еделении веÑ\80Ñ\81ии emacsclient."
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr "ниÑ\87его не пеÑ\80едано, длÑ\8f Ñ\80едакÑ\82иÑ\80ованиÑ\8f Ñ\84айлов на меÑ\81Ñ\82е"
-#: builtin/help.c:121
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
-msgstr "версия emacsclient «%d» слишком старая (< 22)."
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
-#, c-format
-msgid "failed to exec '%s'"
-msgstr "сбой при запуске «%s»"
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr "git show [<опции>] <объект>…"
-#: builtin/help.c:217
+#: builtin/log.c:104
#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
-msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
+msgid "invalid --decorate option: %s"
+msgstr "неправильный параметр для --decorate: %s"
-#: builtin/help.c:229
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
-msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
+#: builtin/log.c:168
+msgid "show source"
+msgstr "показать источник"
-#: builtin/help.c:346
-#, c-format
-msgid "'%s': unknown man viewer."
-msgstr "«%s»: неизвестная программа просмотра man."
+#: builtin/log.c:169
+msgid "Use mail map file"
+msgstr "Использовать файл соответствия почтовых адресов"
-#: builtin/help.c:363
-msgid "no man viewer handled the request"
-msgstr "пÑ\80огÑ\80амма пÑ\80оÑ\81моÑ\82Ñ\80а man не обÑ\80абоÑ\82ала запÑ\80оÑ\81"
+#: builtin/log.c:171
+msgid "only decorate refs that match <pattern>"
+msgstr "декоÑ\80иÑ\80оваÑ\82Ñ\8c Ñ\82олÑ\8cко Ñ\81Ñ\81Ñ\8bлки Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ие <Ñ\88аблонÑ\83>"
-#: builtin/help.c:371
-msgid "no info viewer handled the request"
-msgstr "программа просмотра info не обработала запрос"
+#: builtin/log.c:173
+msgid "do not decorate refs that match <pattern>"
+msgstr "не декорировать ссылки соответствующие <шаблону>"
+
+#: builtin/log.c:174
+msgid "decorate options"
+msgstr "опции формата вывода ссылок"
-#: builtin/help.c:418
+#: builtin/log.c:177
+msgid "Process line range n,m in file, counting from 1"
+msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
+
+#: builtin/log.c:275
#, c-format
-msgid "'%s' is aliased to '%s'"
-msgstr "«%s» — это сокращение для «%s»"
+msgid "Final output: %d %s\n"
+msgstr "Финальный вывод: %d %s\n"
-#: builtin/help.c:445 builtin/help.c:475
+#: builtin/log.c:529
#, c-format
-msgid "usage: %s%s"
-msgstr "использование: %s%s"
+msgid "git show %s: bad file"
+msgstr "git show %s: плохой файл"
-#: builtin/help.c:459
-msgid "'git help config' for more information"
+#: builtin/log.c:544 builtin/log.c:638
+#, c-format
+msgid "could not read object %s"
msgstr ""
-#: builtin/index-pack.c:208
+#: builtin/log.c:663
#, c-format
-msgid "object type mismatch at %s"
-msgstr "несоответствие типа объекта на %s"
+msgid "unknown type: %d"
+msgstr ""
-#: builtin/index-pack.c:228
-#, c-format
-msgid "did not receive expected object %s"
-msgstr "ожидаемый объект не получен на %s"
+#: builtin/log.c:784
+msgid "format.headers without value"
+msgstr "в format.headers не указано значение"
-#: builtin/index-pack.c:231
-#, c-format
-msgid "object %s: expected type %s, found %s"
-msgstr "объект %s: ожидаемый тип %s, получен %s"
+#: builtin/log.c:885
+msgid "name of output directory is too long"
+msgstr "слишком длинное имя выходного каталога"
-#: builtin/index-pack.c:273
+#: builtin/log.c:901
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] "не удалось заполнить %d байт"
-msgstr[1] "не удалось заполнить %d байта"
-msgstr[2] "не удалось заполнить %d байтов"
-msgstr[3] "не удалось заполнить %d байтов"
-
-#: builtin/index-pack.c:283
-msgid "early EOF"
-msgstr "неожиданный конец файла"
+msgid "cannot open patch file %s"
+msgstr ""
-#: builtin/index-pack.c:284
-msgid "read error on input"
-msgstr "ошибка чтения ввода"
+#: builtin/log.c:918
+msgid "need exactly one range"
+msgstr ""
-#: builtin/index-pack.c:296
-msgid "used more bytes than were available"
-msgstr "использовано больше байт, чем было доступно"
+#: builtin/log.c:928
+msgid "not a range"
+msgstr ""
-#: builtin/index-pack.c:303 builtin/pack-objects.c:590
-msgid "pack too large for current definition of off_t"
-msgstr "пакет слишком большой для текущего определения off_t"
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
+msgstr ""
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
-msgid "pack exceeds maximum allowed size"
-msgstr "размер пакета превышает максимальный допустимый"
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
+msgstr ""
-#: builtin/index-pack.c:321
+#: builtin/log.c:1136
#, c-format
-msgid "unable to create '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c «%s»"
+msgid "insane in-reply-to: %s"
+msgstr "оÑ\88ибка в поле in-reply-to: %s"
-#: builtin/index-pack.c:327
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "не удалось открыть файл пакета «%s»"
+#: builtin/log.c:1163
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
-#: builtin/index-pack.c:341
-msgid "pack signature mismatch"
-msgstr "несоответствие подписи пакета"
+#: builtin/log.c:1221
+msgid "two output directories?"
+msgstr ""
-#: builtin/index-pack.c:343
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
#, c-format
-msgid "pack version %<PRIu32> unsupported"
-msgstr "версия пакета %<PRIu32> не поддерживается"
+msgid "unknown commit %s"
+msgstr ""
-#: builtin/index-pack.c:361
+#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
-#: builtin/index-pack.c:482
-#, c-format
-msgid "inflate returned %d"
-msgstr "программа сжатия вернула %d"
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
+msgstr ""
-#: builtin/index-pack.c:531
-msgid "offset value overflow for delta base object"
-msgstr "переполнение значения смещения у базового объекта дельты"
+#: builtin/log.c:1351
+msgid ""
+"failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
-#: builtin/index-pack.c:539
-msgid "delta base offset is out of bound"
-msgstr "смещение базовой дельты вышло за допустимые пределы"
+#: builtin/log.c:1371
+msgid "failed to find exact merge base"
+msgstr ""
-#: builtin/index-pack.c:547
-#, c-format
-msgid "unknown object type %d"
-msgstr "неизвестный тип объекта %d"
+#: builtin/log.c:1382
+msgid "base commit should be the ancestor of revision list"
+msgstr "базовый коммит должен быть предком списка редакций"
-#: builtin/index-pack.c:578
-msgid "cannot pread pack file"
-msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c pread длÑ\8f Ñ\84айла пакеÑ\82а"
+#: builtin/log.c:1386
+msgid "base commit shouldn't be in revision list"
+msgstr "базовÑ\8bй коммиÑ\82 не должен бÑ\8bÑ\82Ñ\8c в Ñ\81пиÑ\81ке Ñ\80едакÑ\86ий"
-#: builtin/index-pack.c:580
-#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] "преждевременное окончание файла пакета, %<PRIuMAX> байт отсутствует"
-msgstr[1] "преждевременное окончание файла пакета, %<PRIuMAX> байта отсутствует"
-msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
+#: builtin/log.c:1439
+msgid "cannot get patch id"
+msgstr "не удалось получить идентификатор патча"
-#: builtin/index-pack.c:606
-msgid "serious inflate inconsistency"
-msgstr "серьезное несоответствие при распаковке"
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
+msgstr ""
-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
-#: builtin/index-pack.c:819 builtin/index-pack.c:828
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
+#: builtin/log.c:1536
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/index-pack.c:754 builtin/pack-objects.c:143
-#: builtin/pack-objects.c:203 builtin/pack-objects.c:297
-#, c-format
-msgid "unable to read %s"
-msgstr "не удалось прочитать %s"
+#: builtin/log.c:1539
+msgid "use [PATCH] even with multiple patches"
+msgstr "выводить [PATCH] даже когда несколько патчей"
-#: builtin/index-pack.c:817
-#, c-format
-msgid "cannot read existing object info %s"
-msgstr "не удалось прочитать информацию существующего объекта %s"
+#: builtin/log.c:1543
+msgid "print patches to standard out"
+msgstr "выводить патчи на стандартный вывод"
-#: builtin/index-pack.c:825
-#, c-format
-msgid "cannot read existing object %s"
-msgstr "не удалось прочитать существующий объект %s"
+#: builtin/log.c:1545
+msgid "generate a cover letter"
+msgstr "создать сопроводительное письмо"
-#: builtin/index-pack.c:839
-#, c-format
-msgid "invalid blob object %s"
-msgstr "неправильный файл двоичного объекта %s"
+#: builtin/log.c:1547
+msgid "use simple number sequence for output file names"
+msgstr "использовать простую последовательность чисел для имен выходных файлов"
-#: builtin/index-pack.c:842 builtin/index-pack.c:861
-msgid "fsck error in packed object"
-msgstr ""
+#: builtin/log.c:1548
+msgid "sfx"
+msgstr "суффикс"
-#: builtin/index-pack.c:858
-#, c-format
-msgid "invalid %s"
-msgstr "неправильный %s"
+#: builtin/log.c:1549
+msgid "use <sfx> instead of '.patch'"
+msgstr "использовать суффикс <суффикс> вместо «.patch»"
-#: builtin/index-pack.c:863
-#, c-format
-msgid "Not all child objects of %s are reachable"
-msgstr "Не все дочерние объекты %s достижимы"
+#: builtin/log.c:1551
+msgid "start numbering patches at <n> instead of 1"
+msgstr "начать нумерацию патчей с <n>, а не с 1"
-#: builtin/index-pack.c:935 builtin/index-pack.c:966
-msgid "failed to apply delta"
-msgstr "сбой при применении дельты"
+#: builtin/log.c:1553
+msgid "mark the series as Nth re-roll"
+msgstr "пометить серию как энную попытку"
-#: builtin/index-pack.c:1136
-msgid "Receiving objects"
-msgstr "Ð\9fолÑ\83Ñ\87ение обÑ\8aекÑ\82ов"
+#: builtin/log.c:1555
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c [RFC PATCH] вмеÑ\81Ñ\82о [PATCH]"
-#: builtin/index-pack.c:1136
-msgid "Indexing objects"
-msgstr "Индексирование объектов"
+#: builtin/log.c:1558
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "Использовать [<префикс>] вместо [PATCH]"
-#: builtin/index-pack.c:1170
-msgid "pack is corrupted (SHA1 mismatch)"
-msgstr "пакет поврежден (несоответствие SHA1)"
+#: builtin/log.c:1561
+msgid "store resulting files in <dir>"
+msgstr "сохранить результирующие файлы в <каталог>"
-#: builtin/index-pack.c:1175
-msgid "cannot fstat packfile"
-msgstr "не удалось выполнить fstat для файла пакета"
+#: builtin/log.c:1564
+msgid "don't strip/add [PATCH]"
+msgstr "не обрезать/добавлять [PATCH]"
-#: builtin/index-pack.c:1178
-msgid "pack has junk at the end"
-msgstr "файл пакета содержит мусор в конце"
+#: builtin/log.c:1567
+msgid "don't output binary diffs"
+msgstr "не выводить двоичные изменения"
-#: builtin/index-pack.c:1190
-msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr "безÑ\83мнаÑ\8f пÑ\83Ñ\82аниÑ\86а в parse_pack_objects()"
+#: builtin/log.c:1569
+msgid "output all-zero hash in From header"
+msgstr "вÑ\8bводиÑ\82Ñ\8c нÑ\83левÑ\83Ñ\8e Ñ\85еÑ\88-Ñ\81Ñ\83ммÑ\83 в заголовке From"
-#: builtin/index-pack.c:1213
-msgid "Resolving deltas"
-msgstr "Ð\9eпÑ\80еделение изменений"
+#: builtin/log.c:1571
+msgid "don't include a patch matching a commit upstream"
+msgstr "не вклÑ\8eÑ\87аÑ\82Ñ\8c паÑ\82Ñ\87, еÑ\81ли коммиÑ\82 Ñ\83же еÑ\81Ñ\82Ñ\8c в вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ке"
-#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
-#, c-format
-msgid "unable to create thread: %s"
-msgstr "не удалось создать поток: %s"
+#: builtin/log.c:1573
+msgid "show patch format instead of default (patch + stat)"
+msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
-#: builtin/index-pack.c:1266
-msgid "confusion beyond insanity"
-msgstr "безÑ\83мнаÑ\8f пÑ\83Ñ\82аниÑ\86а"
+#: builtin/log.c:1575
+msgid "Messaging"
+msgstr "Ð\9fеÑ\80едаÑ\87а Ñ\81ообÑ\89ений"
-#: builtin/index-pack.c:1272
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] "завершено с %d локальным объектом"
-msgstr[1] "завершено с %d локальными объектами"
-msgstr[2] "завершено с %d локальными объектами"
-msgstr[3] "завершено с %d локальными объектами"
+#: builtin/log.c:1576
+msgid "header"
+msgstr "заголовок"
-#: builtin/index-pack.c:1284
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
+#: builtin/log.c:1577
+msgid "add email header"
+msgstr "добавить заголовок сообщения"
-#: builtin/index-pack.c:1288
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "пакет содержит %d неразрешенную дельту"
-msgstr[1] "пакет содержит %d неразрешенные дельты"
-msgstr[2] "пакет содержит %d неразрешенных дельт"
-msgstr[3] "пакет содержит %d неразрешенных дельт"
+#: builtin/log.c:1578 builtin/log.c:1580
+msgid "email"
+msgstr "почта"
-#: builtin/index-pack.c:1312
-#, c-format
-msgid "unable to deflate appended object (%d)"
-msgstr "нельзя сжать присоединенный объект (%d)"
+#: builtin/log.c:1578
+msgid "add To: header"
+msgstr "добавить заголовок To:"
-#: builtin/index-pack.c:1389
-#, c-format
-msgid "local object %s is corrupt"
-msgstr "локальный объект %s поврежден"
+#: builtin/log.c:1580
+msgid "add Cc: header"
+msgstr "добавить заголовок Cc:"
-#: builtin/index-pack.c:1403
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "имя пакета «%s» не оканчивается на «.pack»"
+#: builtin/log.c:1582
+msgid "ident"
+msgstr "идентификатор"
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot write %s file '%s'"
-msgstr ""
+#: builtin/log.c:1583
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
-#: builtin/index-pack.c:1436
-#, c-format
-msgid "cannot close written %s file '%s'"
-msgstr ""
+#: builtin/log.c:1585
+msgid "message-id"
+msgstr "идентификатор-сообщения"
-#: builtin/index-pack.c:1460
-msgid "error while closing pack file"
-msgstr "ошибка при закрытии файла пакета"
+#: builtin/log.c:1586
+msgid "make first mail a reply to <message-id>"
+msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
-#: builtin/index-pack.c:1474
-msgid "cannot store pack file"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ñ\84айл пакеÑ\82а"
+#: builtin/log.c:1587 builtin/log.c:1590
+msgid "boundary"
+msgstr "вложение"
-#: builtin/index-pack.c:1482
-msgid "cannot store index file"
-msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ñ\84айл индекÑ\81а"
+#: builtin/log.c:1588
+msgid "attach the patch"
+msgstr "пÑ\80иложиÑ\82Ñ\8c паÑ\82Ñ\87"
-#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "плохой pack.indexversion=%<PRIu32>"
+#: builtin/log.c:1591
+msgid "inline the patch"
+msgstr "включить патч в текст письма"
-#: builtin/index-pack.c:1595
-#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr "Не удалось открыть существующий файл пакета «%s»"
+#: builtin/log.c:1595
+msgid "enable message threading, styles: shallow, deep"
+msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
-#: builtin/index-pack.c:1597
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr "Не удалось открыть существующий файл индекса для «%s»"
+#: builtin/log.c:1597
+msgid "signature"
+msgstr "подпись"
-#: builtin/index-pack.c:1645
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] "не дельты: %d объект"
-msgstr[1] "не дельты: %d объекта"
-msgstr[2] "не дельты: %d объектов"
-msgstr[3] "не дельты: %d объектов"
+#: builtin/log.c:1598
+msgid "add a signature"
+msgstr "добавить подпись"
-#: builtin/index-pack.c:1652
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] "длина цепочки = %d: %lu объект"
-msgstr[1] "длина цепочки = %d: %lu объекта"
-msgstr[2] "длина цепочки = %d: %lu объектов"
-msgstr[3] "длина цепочки = %d: %lu объектов"
+#: builtin/log.c:1599
+msgid "base-commit"
+msgstr "базовый коммит"
+
+#: builtin/log.c:1600
+msgid "add prerequisite tree info to the patch series"
+msgstr "добавить информацию о требовании дерева к серии патчей"
-#: builtin/index-pack.c:1689
-msgid "Cannot come back to cwd"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c веÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f в Ñ\82екÑ\83Ñ\89ий Ñ\80абоÑ\87ий каÑ\82алог"
+#: builtin/log.c:1602
+msgid "add a signature from a file"
+msgstr "добавиÑ\82Ñ\8c подпиÑ\81Ñ\8c из Ñ\84айла"
-#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
-#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
-#, c-format
-msgid "bad %s"
-msgstr "плохой %s"
+#: builtin/log.c:1603
+msgid "don't print the patch filenames"
+msgstr "не выводить имена файлов патчей"
-#: builtin/index-pack.c:1779
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin нельзя использовать без --stdin"
+#: builtin/log.c:1605
+msgid "show progress while generating patches"
+msgstr "показать прогресс выполнения во создания патчей"
-#: builtin/index-pack.c:1781
-msgid "--stdin requires a git repository"
-msgstr "опция --stdin требует наличия репозитория git"
+#: builtin/log.c:1606
+msgid "rev"
+msgstr ""
-#: builtin/index-pack.c:1787
-msgid "--verify with no packfile name given"
-msgstr "--verify без указания имени файла пакета"
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
-msgid "fsck error in pack objects"
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "не удалось выполнить stat для «%s»"
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
+msgstr ""
-#: builtin/init-db.c:61
+#: builtin/log.c:1687
#, c-format
-msgid "cannot stat template '%s'"
-msgstr "не удалось выполнить stat для шаблона «%s»"
+msgid "invalid ident line: %s"
+msgstr "неправильная строка идентификации: %s"
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr "не удалось выполнить opendir для «%s»"
+#: builtin/log.c:1702
+msgid "-n and -k are mutually exclusive"
+msgstr ""
-#: builtin/init-db.c:78
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr "не удалось выполнить readlink для «%s»"
+#: builtin/log.c:1704
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr "не удалось создать символьную ссылку «%s» на «%s»"
+#: builtin/log.c:1712
+msgid "--name-only does not make sense"
+msgstr "--name-only не имеет смысла"
-#: builtin/init-db.c:86
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr "не удалось скопировать файл «%s» в «%s»"
+#: builtin/log.c:1714
+msgid "--name-status does not make sense"
+msgstr "--name-status не имеет смысла"
-#: builtin/init-db.c:90
-#, c-format
-msgid "ignoring template %s"
-msgstr "игнорирование шаблона %s"
+#: builtin/log.c:1716
+msgid "--check does not make sense"
+msgstr "--check не имеет смысла"
-#: builtin/init-db.c:121
-#, c-format
-msgid "templates not found in %s"
-msgstr ""
+#: builtin/log.c:1748
+msgid "standard output, or directory, which one?"
+msgstr "стандартный вывод или каталог?"
-#: builtin/init-db.c:136
-#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr "не копирую шаблоны из «%s»: %s"
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
-#: builtin/init-db.c:329
-#, c-format
-msgid "unable to handle file type %d"
-msgstr "не удается обработать файл типа %d"
+#: builtin/log.c:1841
+msgid "Interdiff:"
+msgstr ""
-#: builtin/init-db.c:332
+#: builtin/log.c:1842
#, c-format
-msgid "unable to move %s to %s"
-msgstr "не удается переместить файл %s в %s"
+msgid "Interdiff against v%d:"
+msgstr ""
-#: builtin/init-db.c:349 builtin/init-db.c:352
-#, c-format
-msgid "%s already exists"
-msgstr "%s уже существует"
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
+msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
-#: builtin/init-db.c:406
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
+#: builtin/log.c:1860
+msgid "Range-diff:"
+msgstr ""
-#: builtin/init-db.c:410
+#: builtin/log.c:1861
#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
+msgid "Range-diff against v%d:"
+msgstr ""
-#: builtin/init-db.c:411
+#: builtin/log.c:1872
#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr "Ð\98ниÑ\86иализиÑ\80ован пÑ\83Ñ\81Ñ\82ой Ñ\80епозиÑ\82оÑ\80ий Git в %s%s\n"
+msgid "unable to read signature file '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\84айл подпиÑ\81и «%s»"
-#: builtin/init-db.c:459
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
-"[--shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
+#: builtin/log.c:1908
+msgid "Generating patches"
+msgstr "Создание патчей"
-#: builtin/init-db.c:482
-msgid "permissions"
-msgstr "права-доступа"
+#: builtin/log.c:1952
+msgid "failed to create output files"
+msgstr ""
-#: builtin/init-db.c:483
-msgid "specify that the git repository is to be shared amongst several users"
-msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
+#: builtin/log.c:2011
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]"
-#: builtin/init-db.c:517 builtin/init-db.c:522
+#: builtin/log.c:2065
#, c-format
-msgid "cannot mkdir %s"
-msgstr "не удалось выполнить mkdir %s"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> "
+"manually.\n"
+msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n"
-#: builtin/init-db.c:526
-#, c-format
-msgid "cannot chdir to %s"
-msgstr "не удалось выполнить chdir в %s"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<опции>] [<файл>…]"
-#: builtin/init-db.c:547
-#, 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/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr "выводить имена файлов с метками"
-#: builtin/init-db.c:575
-#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов"
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»"
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
-msgstr "редактировать файлы на месте"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr "показывать кэшированные файлы при выводе (по умолчанию)"
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
-msgstr "удалять пустые завершители"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr "показывать удаленные файлы при выводе"
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
-msgstr "где помеÑ\81Ñ\82иÑ\82Ñ\8c новÑ\8bй завеÑ\80Ñ\88иÑ\82елÑ\8c"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr "показÑ\8bваÑ\82Ñ\8c измененнÑ\8bе Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
-msgstr "дейÑ\81Ñ\82вие, еÑ\81ли завеÑ\80Ñ\88иÑ\82елÑ\8c Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr "показÑ\8bваÑ\82Ñ\8c дÑ\80Ñ\83гие Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
-msgstr "дейÑ\81Ñ\82вие, еÑ\81ли завеÑ\80Ñ\88иÑ\82елÑ\8c не Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr "показÑ\8bваÑ\82Ñ\8c игноÑ\80иÑ\80Ñ\83емÑ\8bе Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\82олÑ\8cко завеÑ\80Ñ\88иÑ\82ели"
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr "показÑ\8bваÑ\82Ñ\8c имÑ\8f индекÑ\81иÑ\80ованного обÑ\8aекÑ\82а на вÑ\8bводе"
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
-msgstr "не пÑ\80именÑ\8fÑ\82Ñ\8c пÑ\80авила из Ñ\84айла конÑ\84игÑ\83Ñ\80аÑ\86ии"
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\84айлÑ\8b в Ñ\84айловой Ñ\81иÑ\81Ñ\82еме, коÑ\82оÑ\80Ñ\8bе должнÑ\8b бÑ\8bÑ\82Ñ\8c Ñ\83даленÑ\8b"
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
-msgstr "обÑ\8aединиÑ\82Ñ\8c знаÑ\87ениÑ\8f Ñ\80азделеннÑ\8bе пÑ\80обелом"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\82олÑ\8cко имена Ñ\83 «дÑ\80Ñ\83гиÑ\85» каÑ\82алогов"
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
-msgstr "указание опций разбора"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr "показать концы строк файлов"
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
-msgstr "завеÑ\80Ñ\88иÑ\82елÑ\8c"
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr "не показÑ\8bваÑ\82Ñ\8c пÑ\83Ñ\81Ñ\82Ñ\8bе каÑ\82алоги"
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
-msgstr "завеÑ\80Ñ\88иÑ\82ели длÑ\8f добавлениÑ\8f"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr "показÑ\8bваÑ\82Ñ\8c не Ñ\81лиÑ\82Ñ\8bе Ñ\84айлÑ\8b на вÑ\8bводе"
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
-msgstr "--trailer одновременно с --only-input не имеет смысла"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr "показывать информации о разрешении конфликтов и отмене"
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
-msgstr "ниÑ\87его не пеÑ\80едано, длÑ\8f Ñ\80едакÑ\82иÑ\80ованиÑ\8f Ñ\84айлов на меÑ\81Ñ\82е"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr "пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\84айлÑ\8b, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ие Ñ\88аблонÑ\83"
-#: builtin/log.c:51
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr "прочитать шаблоны исключения из <файл>"
-#: builtin/log.c:52
-msgid "git show [<options>] <object>..."
-msgstr "git show [<опции>] <объект>…"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
-#: builtin/log.c:96
-#, c-format
-msgid "invalid --decorate option: %s"
-msgstr "неправильный параметр для --decorate: %s"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr "добавить стандартные исключения git"
-#: builtin/log.c:157
-msgid "suppress diff output"
-msgstr "не вÑ\8bводиÑ\82Ñ\8c Ñ\80азлиÑ\87иÑ\8f"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr "вÑ\8bводиÑ\82Ñ\8c пÑ\83Ñ\82и оÑ\82ноÑ\81иÑ\82елÑ\8cно коÑ\80невого каÑ\82алога пÑ\80оекÑ\82а"
-#: builtin/log.c:158
-msgid "show source"
-msgstr "показать источник"
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr "рекурсивно по подмодулям"
-#: builtin/log.c:159
-msgid "Use mail map file"
-msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\84айл Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82виÑ\8f поÑ\87Ñ\82овÑ\8bÑ\85 адÑ\80еÑ\81ов"
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "еÑ\81ли какой-либо <Ñ\84айл> не в индекÑ\81е, Ñ\81Ñ\87иÑ\82аÑ\82Ñ\8c Ñ\8dÑ\82о оÑ\88ибкой"
-#: builtin/log.c:161
-msgid "only decorate refs that match <pattern>"
-msgstr "декорировать только ссылки соответствующие <шаблону>"
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr "указатель-дерева"
-#: builtin/log.c:163
-msgid "do not decorate refs that match <pattern>"
-msgstr "не декоÑ\80иÑ\80оваÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлки Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ие <Ñ\88аблонÑ\83>"
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "пÑ\80иÑ\82воÑ\80иÑ\82Ñ\8cÑ\81Ñ\8f, Ñ\87Ñ\82о пÑ\83Ñ\82и Ñ\83даленÑ\8b, Ñ\82.к. <Ñ\83казаÑ\82елÑ\8c-деÑ\80ева> еÑ\89е Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
-#: builtin/log.c:164
-msgid "decorate options"
-msgstr "опÑ\86ии Ñ\84оÑ\80маÑ\82а вÑ\8bвода Ñ\81Ñ\81Ñ\8bлок"
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr "показаÑ\82Ñ\8c оÑ\82ладоÑ\87нÑ\83Ñ\8e инÑ\84оÑ\80маÑ\86иÑ\8e"
-#: builtin/log.c:167
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запуск>]\n [-q | --quiet] [--exit-code] [--get-url]\n [--symref] [<репозиторий> [<ссылки>…]]"
-#: builtin/log.c:265
-#, c-format
-msgid "Final output: %d %s\n"
-msgstr "Финальный вывод: %d %s\n"
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr "не выводить URL внешних репозиториев"
-#: builtin/log.c:516
-#, c-format
-msgid "git show %s: bad file"
-msgstr "git show %s: плохой файл"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+msgid "exec"
+msgstr "запуск"
-#: builtin/log.c:531 builtin/log.c:625
-#, c-format
-msgid "Could not read object %s"
-msgstr "Не удалось прочитать объект %s"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr "путь к git-upload-pack на внешнем сервере"
-#: builtin/log.c:649
-#, c-format
-msgid "Unknown type: %d"
-msgstr "Неизвестный тип объекта: %d"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr "ограничить вывод метками"
-#: builtin/log.c:770
-msgid "format.headers without value"
-msgstr "в format.headers не Ñ\83казано знаÑ\87ение"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr "огÑ\80аниÑ\87иÑ\82Ñ\8c вÑ\8bвод Ñ\83казаÑ\82елÑ\8fми на веÑ\82ки"
-#: builtin/log.c:871
-msgid "name of output directory is too long"
-msgstr "слишком длинное имя выходного каталога"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr "не показывать удалённые метки"
-#: builtin/log.c:887
-#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Ну удалось открыть файл изменений %s"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr "учитывать url.<база>.insteadOf"
-#: builtin/log.c:904
-msgid "Need exactly one range."
-msgstr "Ð\9dÑ\83жен Ñ\82олÑ\8cко один диапазон."
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "вÑ\8bÑ\85одиÑ\82Ñ\8c Ñ\81 кодом 2, еÑ\81ли Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ие Ñ\81Ñ\81Ñ\8bлки не найденÑ\8b"
-#: builtin/log.c:914
-msgid "Not a range."
-msgstr "Ð\9dе Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f диапазоном."
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "показаÑ\82Ñ\8c Ñ\82акже внÑ\83Ñ\82Ñ\80еннÑ\8eÑ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 в дополнение к обÑ\8aекÑ\82Ñ\83, на коÑ\82оÑ\80Ñ\8bй она Ñ\83казÑ\8bваеÑ\82"
-#: builtin/log.c:1020
-msgid "Cover letter needs email format"
-msgstr "Сопроводительное письмо должно быть в формате электронной почты"
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]"
-#: builtin/log.c:1101
-#, c-format
-msgid "insane in-reply-to: %s"
-msgstr "ошибка в поле in-reply-to: %s"
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "выводить только деревья"
-#: builtin/log.c:1128
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "проходить рекурсивно в поддеревья"
-#: builtin/log.c:1178
-msgid "Two output directories?"
-msgstr "Ð\94ва вÑ\8bÑ\85однÑ\8bÑ\85 каÑ\82алога?"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "вÑ\8bводиÑ\82Ñ\8c деÑ\80евÑ\8cÑ\8f пÑ\80и Ñ\80екÑ\83Ñ\80Ñ\81ивном пÑ\80оÑ\85оде"
-#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
-#, c-format
-msgid "Unknown commit %s"
-msgstr "Неизвестный коммит %s"
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "разделять записи с помощью НУЛЕВОГО байта"
-#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Не удалось разрешить «%s» как ссылку."
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "включить размер объекта"
-#: builtin/log.c:1300
-msgid "Could not find exact merge base."
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и Ñ\82оÑ\87нÑ\83Ñ\8e базÑ\83 Ñ\81лиÑ\8fниÑ\8f."
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "вÑ\8bводиÑ\82Ñ\8c Ñ\82олÑ\8cко имена Ñ\84айлов"
-#: builtin/log.c:1304
-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/ls-tree.c:143
+msgid "use full path names"
+msgstr "использовать полные пути"
-#: builtin/log.c:1324
-msgid "Failed to find exact merge base"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и Ñ\82оÑ\87нÑ\83Ñ\8e базÑ\83 Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "вÑ\8bвеÑ\81Ñ\82и полное деÑ\80ево; не Ñ\82олÑ\8cко Ñ\82екÑ\83Ñ\89ий каÑ\82алог (вклÑ\8eÑ\87аеÑ\82 в Ñ\81ебÑ\8f --full-name)"
-#: builtin/log.c:1335
-msgid "base commit should be the ancestor of revision list"
-msgstr "базовый коммит должен быть предком списка редакций"
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "пустой mbox: «%s»"
-#: builtin/log.c:1339
-msgid "base commit shouldn't be in revision list"
-msgstr "базовый коммит не должен быть в списке редакций"
+#: builtin/merge.c:54
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<опции>] [<коммит>…]"
-#: builtin/log.c:1392
-msgid "cannot get patch id"
-msgstr "не удалось получить идентификатор патча"
+#: builtin/merge.c:55
+msgid "git merge --abort"
+msgstr "git merge --abort"
-#: builtin/log.c:1452
-msgid "use [PATCH n/m] even with a single patch"
-msgstr "выводить [PATCH n/m] даже когда один патч"
+#: builtin/merge.c:56
+msgid "git merge --continue"
+msgstr "git merge --continue"
-#: builtin/log.c:1455
-msgid "use [PATCH] even with multiple patches"
-msgstr "вÑ\8bводиÑ\82Ñ\8c [PATCH] даже когда неÑ\81колÑ\8cко паÑ\82Ñ\87ей"
+#: builtin/merge.c:116
+msgid "switch `m' requires a value"
+msgstr "пÑ\80и Ñ\83казании паÑ\80амеÑ\82Ñ\80а «m» Ñ\82Ñ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\83казаÑ\82Ñ\8c знаÑ\87ение"
-#: builtin/log.c:1459
-msgid "print patches to standard out"
-msgstr "выводить патчи на стандартный вывод"
+#: builtin/merge.c:139
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
-#: builtin/log.c:1461
-msgid "generate a cover letter"
-msgstr "создать сопроводительное письмо"
+#: builtin/merge.c:185
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Не удалось найти стратегию слияния «%s».\n"
-#: builtin/log.c:1463
-msgid "use simple number sequence for output file names"
-msgstr "использовать простую последовательность чисел для имен выходных файлов"
+#: builtin/merge.c:186
+#, c-format
+msgid "Available strategies are:"
+msgstr "Доступные стратегии:"
-#: builtin/log.c:1464
-msgid "sfx"
-msgstr "суффикс"
+#: builtin/merge.c:191
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Доступные пользовательские стратегии:"
-#: builtin/log.c:1465
-msgid "use <sfx> instead of '.patch'"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81Ñ\83Ñ\84Ñ\84икÑ\81 <Ñ\81Ñ\83Ñ\84Ñ\84икÑ\81> вмеÑ\81Ñ\82о «.patch»"
+#: builtin/merge.c:242 builtin/pull.c:150
+msgid "do not show a diffstat at the end of the merge"
+msgstr "не вÑ\8bводиÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 изменений поÑ\81ле оконÑ\87аниÑ\8f Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1467
-msgid "start numbering patches at <n> instead of 1"
-msgstr "наÑ\87аÑ\82Ñ\8c нÑ\83меÑ\80аÑ\86иÑ\8e паÑ\82Ñ\87ей Ñ\81 <n>, а не Ñ\81 1"
+#: builtin/merge.c:245 builtin/pull.c:153
+msgid "show a diffstat at the end of the merge"
+msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 изменений поÑ\81ле оконÑ\87аниÑ\8f Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1469
-msgid "mark the series as Nth re-roll"
-msgstr "пометить серию как энную попытку"
+#: builtin/merge.c:246 builtin/pull.c:156
+msgid "(synonym to --stat)"
+msgstr "(синоним для --stat)"
-#: builtin/log.c:1471
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c [RFC PATCH] вмеÑ\81Ñ\82о [PATCH]"
+#: builtin/merge.c:248 builtin/pull.c:159
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "добавиÑ\82Ñ\8c (макÑ\81имÑ\83м <n>) запиÑ\81ей из коÑ\80оÑ\82кого жÑ\83Ñ\80нала в Ñ\81ообÑ\89ение коммиÑ\82а Ñ\83 Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1474
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Использовать [<префикс>] вместо [PATCH]"
+#: builtin/merge.c:251 builtin/pull.c:165
+msgid "create a single commit instead of doing a merge"
+msgstr "создать один коммит, вместо выполнения слияния"
-#: builtin/log.c:1477
-msgid "store resulting files in <dir>"
-msgstr "Ñ\81оÑ\85Ñ\80аниÑ\82Ñ\8c Ñ\80езÑ\83лÑ\8cÑ\82иÑ\80Ñ\83Ñ\8eÑ\89ие Ñ\84айлÑ\8b в <каÑ\82алог>"
+#: builtin/merge.c:253 builtin/pull.c:168
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "Ñ\81делаÑ\82Ñ\8c коммиÑ\82, еÑ\81ли Ñ\81лиÑ\8fние пÑ\80оÑ\88ло Ñ\83Ñ\81пеÑ\88но (по Ñ\83молÑ\87аниÑ\8e)"
-#: builtin/log.c:1480
-msgid "don't strip/add [PATCH]"
-msgstr "не обÑ\80езаÑ\82Ñ\8c/добавлÑ\8fÑ\82Ñ\8c [PATCH]"
+#: builtin/merge.c:255 builtin/pull.c:171
+msgid "edit message before committing"
+msgstr "оÑ\82Ñ\80едакÑ\82иÑ\80оваÑ\82Ñ\8c Ñ\81ообÑ\89ение пеÑ\80ед вÑ\8bполнением коммиÑ\82а"
-#: builtin/log.c:1483
-msgid "don't output binary diffs"
-msgstr "не выводить двоичные различия"
+#: builtin/merge.c:257
+msgid "allow fast-forward (default)"
+msgstr "разрешить перемотку вперед (по умолчанию)"
-#: builtin/log.c:1485
-msgid "output all-zero hash in From header"
-msgstr "вÑ\8bводиÑ\82Ñ\8c нÑ\83левÑ\83Ñ\8e Ñ\85Ñ\8dÑ\88-Ñ\81Ñ\83ммÑ\83 в заголовке From"
+#: builtin/merge.c:259 builtin/pull.c:178
+msgid "abort if fast-forward is not possible"
+msgstr "оÑ\82мениÑ\82Ñ\8c вÑ\8bполнение Ñ\81лиÑ\8fниÑ\8f, еÑ\81ли пеÑ\80емоÑ\82ка впеÑ\80ед невозможна"
-#: builtin/log.c:1487
-msgid "don't include a patch matching a commit upstream"
-msgstr "не вклÑ\8eÑ\87аÑ\82Ñ\8c паÑ\82Ñ\87, еÑ\81ли коммиÑ\82 Ñ\83же еÑ\81Ñ\82Ñ\8c в вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89ей веÑ\82ке"
+#: builtin/merge.c:263 builtin/pull.c:181
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "пÑ\80овеÑ\80иÑ\82Ñ\8c, Ñ\87Ñ\82о Ñ\83казаннÑ\8bй коммиÑ\82 имееÑ\82 веÑ\80нÑ\83Ñ\8e Ñ\8dлекÑ\82Ñ\80оннÑ\83Ñ\8e подпиÑ\81Ñ\8c GPG"
-#: builtin/log.c:1489
-msgid "show patch format instead of default (patch + stat)"
-msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
+#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
+#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+msgid "strategy"
+msgstr "стратегия"
-#: builtin/log.c:1491
-msgid "Messaging"
-msgstr "Ð\9fеÑ\80едаÑ\87а Ñ\81ообÑ\89ений"
+#: builtin/merge.c:265 builtin/pull.c:186
+msgid "merge strategy to use"
+msgstr "иÑ\81полÑ\8cзÑ\83емаÑ\8f Ñ\81Ñ\82Ñ\80аÑ\82егиÑ\8f Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1492
-msgid "header"
-msgstr "заголовок"
+#: builtin/merge.c:266 builtin/pull.c:189
+msgid "option=value"
+msgstr "опÑ\86иÑ\8f=знаÑ\87ение"
-#: builtin/log.c:1493
-msgid "add email header"
-msgstr "добавиÑ\82Ñ\8c заголовок Ñ\81ообÑ\89ения"
+#: builtin/merge.c:267 builtin/pull.c:190
+msgid "option for selected merge strategy"
+msgstr "опÑ\86ии длÑ\8f вÑ\8bбÑ\80анной Ñ\81Ñ\82Ñ\80аÑ\82егии Ñ\81лиÑ\8fния"
-#: builtin/log.c:1494 builtin/log.c:1496
-msgid "email"
-msgstr "почта"
+#: builtin/merge.c:269
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
-#: builtin/log.c:1494
-msgid "add To: header"
-msgstr "добавиÑ\82Ñ\8c заголовок To:"
+#: builtin/merge.c:276
+msgid "abort the current in-progress merge"
+msgstr "оÑ\82мениÑ\82Ñ\8c вÑ\8bполнение пÑ\80оиÑ\81Ñ\85одÑ\8fÑ\89его Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1496
-msgid "add Cc: header"
-msgstr "добавиÑ\82Ñ\8c заголовок Cc:"
+#: builtin/merge.c:278
+msgid "continue the current in-progress merge"
+msgstr "пÑ\80одолжиÑ\82Ñ\8c вÑ\8bполнение пÑ\80оиÑ\81Ñ\85одÑ\8fÑ\89его Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/log.c:1498
-msgid "ident"
-msgstr "идентификатор"
+#: builtin/merge.c:280 builtin/pull.c:197
+msgid "allow merging unrelated histories"
+msgstr "разрешить слияние несвязанных историй изменений"
-#: builtin/log.c:1499
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
+#: builtin/merge.c:286
+msgid "verify commit-msg hook"
+msgstr "проверить перехватчик commit-msg"
-#: builtin/log.c:1501
-msgid "message-id"
-msgstr "иденÑ\82иÑ\84икаÑ\82оÑ\80-Ñ\81ообÑ\89ениÑ\8f"
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stash."
-#: builtin/log.c:1502
-msgid "make first mail a reply to <message-id>"
-msgstr "Ñ\81делаÑ\82Ñ\8c пеÑ\80вое пиÑ\81Ñ\8cмо оÑ\82веÑ\82ом на <иденÑ\82иÑ\84икаÑ\82оÑ\80-Ñ\81ообÑ\89ениÑ\8f>"
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr "Ñ\81бой пÑ\80и вÑ\8bполнении stash"
-#: builtin/log.c:1503 builtin/log.c:1506
-msgid "boundary"
-msgstr "вложение"
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr "неправильный объект: %s"
-#: builtin/log.c:1504
-msgid "attach the patch"
-msgstr "приложить патч"
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr "сбой при выполнении read-tree"
-#: builtin/log.c:1507
-msgid "inline the patch"
-msgstr "включить патч в текст письма"
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr " (нечего уплотнять)"
-#: builtin/log.c:1511
-msgid "enable message threading, styles: shallow, deep"
-msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Уплотнение коммита — не обновляя HEAD\n"
-#: builtin/log.c:1513
-msgid "signature"
-msgstr "подпись"
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Нет сообщения слияния — не обновляем HEAD\n"
-#: builtin/log.c:1514
-msgid "add a signature"
-msgstr "добавить подпись"
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "«%s» не указывает на коммит"
-#: builtin/log.c:1515
-msgid "base-commit"
-msgstr "базовый коммит"
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Неправильная строка branch.%s.mergeoptions: %s"
-#: builtin/log.c:1516
-msgid "add prerequisite tree info to the patch series"
-msgstr "добавиÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о Ñ\82Ñ\80ебовании деÑ\80ева к Ñ\81еÑ\80ии паÑ\82Ñ\87ей"
+#: builtin/merge.c:712
+msgid "Not handling anything other than two heads merge."
+msgstr "Ð\9dе обÑ\80абаÑ\82Ñ\8bваÑ\8e ниÑ\87его, кÑ\80оме Ñ\81лиÑ\8fниÑ\8f двÑ\83Ñ\85 Ñ\83казаÑ\82елей на веÑ\82ки."
-#: builtin/log.c:1518
-msgid "add a signature from a file"
-msgstr "добавить подпись из файла"
+#: builtin/merge.c:726
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Неизвестный параметр merge-recursive: -X%s"
-#: builtin/log.c:1519
-msgid "don't print the patch filenames"
-msgstr "не выводить имена файлов патчей"
+#: builtin/merge.c:741
+#, c-format
+msgid "unable to write %s"
+msgstr "не удалось записать %s"
-#: builtin/log.c:1521
-msgid "show progress while generating patches"
-msgstr "показать прогресс выполнения во создания патчей"
+#: builtin/merge.c:793
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Не удалось прочесть из «%s»"
-#: builtin/log.c:1596
+#: builtin/merge.c:802
#, c-format
-msgid "invalid ident line: %s"
-msgstr "неправильная строка идентификации: %s"
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
+
+#: builtin/merge.c:808
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
-#: builtin/log.c:1611
-msgid "-n and -k are mutually exclusive"
+#: builtin/merge.c:813
+msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/log.c:1613
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#: builtin/merge.c:816
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
msgstr ""
-#: builtin/log.c:1621
-msgid "--name-only does not make sense"
-msgstr "--name-only не имеет смысла"
+#: builtin/merge.c:857
+msgid "Empty commit message."
+msgstr "Пустое сообщение коммита."
-#: builtin/log.c:1623
-msgid "--name-status does not make sense"
-msgstr "--name-status не имеет смысла"
+#: builtin/merge.c:876
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Прекрасно.\n"
-#: builtin/log.c:1625
-msgid "--check does not make sense"
-msgstr "--check не имеет смысла"
+#: builtin/merge.c:936
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
-#: builtin/log.c:1657
-msgid "standard output, or directory, which one?"
-msgstr "стандартный вывод или каталог?"
+#: builtin/merge.c:975
+msgid "No current branch."
+msgstr "Нет текущей ветки."
+
+#: builtin/merge.c:977
+msgid "No remote for the current branch."
+msgstr "У текущей ветки нет внешнего репозитория."
+
+#: builtin/merge.c:979
+msgid "No default upstream defined for the current branch."
+msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
+
+#: builtin/merge.c:984
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
-#: builtin/log.c:1659
+#: builtin/merge.c:1041
#, c-format
-msgid "Could not create directory '%s'"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c каÑ\82алог «%s»"
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Ð\9fлоÑ\85ое знаÑ\87ение «%s» в пеÑ\80еменной окÑ\80Ñ\83жениÑ\8f «%s»"
-#: builtin/log.c:1752
+#: builtin/merge.c:1144
#, c-format
-msgid "unable to read signature file '%s'"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c Ñ\84айл подпиÑ\81и «%s»"
+msgid "not something we can merge in %s: %s"
+msgstr "не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\82ем, Ñ\87Ñ\82о можно Ñ\81лиÑ\82Ñ\8c в %s: %s"
-#: builtin/log.c:1785
-msgid "Generating patches"
-msgstr "Создание патчей"
+#: builtin/merge.c:1178
+msgid "not something we can merge"
+msgstr "не является тем, что можно слить"
+
+#: builtin/merge.c:1281
+msgid "--abort expects no arguments"
+msgstr "опция --abort не принимает аргументы"
-#: builtin/log.c:1829
-msgid "Failed to create output files"
-msgstr "Сбой пÑ\80и Ñ\81оздании вÑ\8bÑ\85однÑ\8bÑ\85 Ñ\84айлов"
+#: builtin/merge.c:1285
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Ð\9dеÑ\82 Ñ\81лиÑ\8fниÑ\8f, коÑ\82оÑ\80ое можно оÑ\82мениÑ\82Ñ\8c (оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\84айл MERGE_HEAD)."
-#: builtin/log.c:1880
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]"
+#: builtin/merge.c:1297
+msgid "--continue expects no arguments"
+msgstr "опция --continue не принимает аргументы"
-#: builtin/log.c:1934
-#, c-format
+#: builtin/merge.c:1301
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
+
+#: builtin/merge.c:1317
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> "
-"manually.\n"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c найÑ\82и оÑ\82Ñ\81леживаемÑ\83Ñ\8e внеÑ\88нÑ\8eÑ\8e веÑ\82кÑ\83, Ñ\83кажиÑ\82е <вÑ\8bÑ\88еÑ\81Ñ\82оÑ\8fÑ\89Ñ\83Ñ\8e-веÑ\82кÑ\83> вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e.\n"
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr "Ð\92Ñ\8b не завеÑ\80Ñ\88или Ñ\81лиÑ\8fние (пÑ\80иÑ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\84айл MERGE_HEAD).\nÐ\92Ñ\8bполниÑ\82е коммиÑ\82 ваÑ\88иÑ\85 изменений, пеÑ\80ед Ñ\81лиÑ\8fнием."
-#: builtin/ls-files.c:469
-msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<опции>] [<файл>…]"
+#: builtin/merge.c:1324
+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/ls-files.c:518
-msgid "identify the file status with tags"
-msgstr "вÑ\8bводиÑ\82Ñ\8c имена Ñ\84айлов Ñ\81 меÑ\82ками"
+#: builtin/merge.c:1327
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Ð\92Ñ\8b не завеÑ\80Ñ\88или копиÑ\80ование коммиÑ\82а (пÑ\80иÑ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82 Ñ\84айл CHERRY_PICK_HEAD)."
-#: builtin/ls-files.c:520
-msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81имволÑ\8b в нижнем Ñ\80егиÑ\81Ñ\82Ñ\80е длÑ\8f «пÑ\80едположиÑ\82елÑ\8cно без изменений» Ñ\84айлов"
+#: builtin/merge.c:1341
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Ð\9dелÑ\8cзÑ\8f иÑ\81полÑ\8cзоваÑ\82Ñ\8c одновÑ\80еменно --squash и --no-ff."
-#: builtin/ls-files.c:522
-msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81имволÑ\8b нижнего Ñ\80егиÑ\81Ñ\82Ñ\80а длÑ\8f Ñ\84айлов «fsmonitor clean»"
+#: builtin/merge.c:1349
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Ð\9aоммиÑ\82 не Ñ\83казан и паÑ\80амеÑ\82Ñ\80 merge.defaultToUpstream не Ñ\83Ñ\81Ñ\82ановлен."
-#: builtin/ls-files.c:524
-msgid "show cached files in the output (default)"
-msgstr "показÑ\8bваÑ\82Ñ\8c кÑ\8dÑ\88иÑ\80ованнÑ\8bе Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе (по Ñ\83молÑ\87аниÑ\8e)"
+#: builtin/merge.c:1366
+msgid "Squash commit into empty head not supported yet"
+msgstr "УплоÑ\82нение коммиÑ\82а в пÑ\83Ñ\81Ñ\82Ñ\83Ñ\8e веÑ\82кÑ\83 еÑ\89е не поддеÑ\80живаеÑ\82Ñ\81Ñ\8f"
-#: builtin/ls-files.c:526
-msgid "show deleted files in the output"
-msgstr "показÑ\8bваÑ\82Ñ\8c Ñ\83даленнÑ\8bе Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
+#: builtin/merge.c:1368
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Ð\9aоммиÑ\82, не Ñ\8fвлÑ\8fÑ\8eÑ\89ийÑ\81Ñ\8f пеÑ\80емоÑ\82кой впеÑ\80ед, неÑ\82 Ñ\81мÑ\8bÑ\81ла делаÑ\82Ñ\8c в пÑ\83Ñ\81Ñ\82Ñ\83Ñ\8e веÑ\82кÑ\83."
-#: builtin/ls-files.c:528
-msgid "show modified files in the output"
-msgstr "показывать измененные файлы при выводе"
+#: builtin/merge.c:1373
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s не является тем, что можно слить"
-#: builtin/ls-files.c:530
-msgid "show other files in the output"
-msgstr "показÑ\8bваÑ\82Ñ\8c дÑ\80Ñ\83гие Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
+#: builtin/merge.c:1375
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Ð\9cожно Ñ\82олÑ\8cко один коммиÑ\82 в пÑ\83Ñ\81Ñ\82Ñ\83Ñ\8e веÑ\82кÑ\83."
-#: builtin/ls-files.c:532
-msgid "show ignored files in the output"
-msgstr "показÑ\8bваÑ\82Ñ\8c игноÑ\80иÑ\80Ñ\83емÑ\8bе Ñ\84айлÑ\8b пÑ\80и вÑ\8bводе"
+#: builtin/merge.c:1454
+msgid "refusing to merge unrelated histories"
+msgstr "оÑ\82каз Ñ\81лиÑ\8fниÑ\8f неÑ\81вÑ\8fзаннÑ\8bÑ\85 иÑ\81Ñ\82оÑ\80ий изменений"
-#: builtin/ls-files.c:535
-msgid "show staged contents' object name in the output"
-msgstr "показÑ\8bваÑ\82Ñ\8c имÑ\8f индекÑ\81иÑ\80ованного обÑ\8aекÑ\82а на вÑ\8bводе"
+#: builtin/merge.c:1463
+msgid "Already up to date."
+msgstr "Уже обновлено."
-#: builtin/ls-files.c:537
-msgid "show files on the filesystem that need to be removed"
-msgstr "показывать файлы в файловой системе, которые должны быть удалены"
+#: builtin/merge.c:1473
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Обновление %s..%s\n"
-#: builtin/ls-files.c:539
-msgid "show 'other' directories' names only"
-msgstr "показывать только имена у «других» каталогов"
+#: builtin/merge.c:1515
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Попытка тривиального слияния в индексе…\n"
-#: builtin/ls-files.c:541
-msgid "show line endings of files"
-msgstr "показать концы строк файлов"
+#: builtin/merge.c:1522
+#, c-format
+msgid "Nope.\n"
+msgstr "Не вышло.\n"
-#: builtin/ls-files.c:543
-msgid "don't show empty directories"
-msgstr "не показÑ\8bваÑ\82Ñ\8c пÑ\83Ñ\81Ñ\82Ñ\8bе каÑ\82алоги"
+#: builtin/merge.c:1547
+msgid "Already up to date. Yeeah!"
+msgstr "Уже обновлено. Ð\9aÑ\80Ñ\83Ñ\82о!"
-#: builtin/ls-files.c:546
-msgid "show unmerged files in the output"
-msgstr "показÑ\8bваÑ\82Ñ\8c не Ñ\81лиÑ\82Ñ\8bе Ñ\84айлÑ\8b на вÑ\8bводе"
+#: builtin/merge.c:1553
+msgid "Not possible to fast-forward, aborting."
+msgstr "Ð\9fеÑ\80емоÑ\82ка впеÑ\80ед невозможна, оÑ\82мена."
-#: builtin/ls-files.c:548
-msgid "show resolve-undo information"
-msgstr "показывать информации о разрешении конфликтов и отмене"
+#: builtin/merge.c:1576 builtin/merge.c:1655
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Перемотка дерева к исходному состоянию…\n"
-#: builtin/ls-files.c:550
-msgid "skip files matching pattern"
-msgstr "пропустить файлы, соответствующие шаблону"
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Попытка слияния с помощью стратегии %s…\n"
-#: builtin/ls-files.c:553
-msgid "exclude patterns are read from <file>"
-msgstr "прочитать шаблоны исключения из <файл>"
+#: builtin/merge.c:1646
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ни одна стратегия слияния не обработала слияние.\n"
-#: builtin/ls-files.c:556
-msgid "read additional per-directory exclude patterns in <file>"
-msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
+#: builtin/merge.c:1648
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Сбой при слиянии с помощью стратегии %s.\n"
-#: builtin/ls-files.c:558
-msgid "add the standard git exclusions"
-msgstr "добавить стандартные исключения git"
+#: builtin/merge.c:1657
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
-#: builtin/ls-files.c:561
-msgid "make the output relative to the project top directory"
-msgstr "выводить пути относительно корневого каталога проекта"
+#: builtin/merge.c:1669
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
-#: builtin/ls-files.c:564
-msgid "recurse through submodules"
-msgstr "рекурсивно по подмодулям"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
-#: builtin/ls-files.c:566
-msgid "if any <file> is not in the index, treat this as an error"
-msgstr "если какой-либо <файл> не в индексе, считать это ошибкой"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <коммит>…"
-#: builtin/ls-files.c:567
-msgid "tree-ish"
-msgstr "указатель-дерева"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <коммит>…"
-#: builtin/ls-files.c:568
-msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует"
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <коммит> <коммит>"
-#: builtin/ls-files.c:570
-msgid "show debugging data"
-msgstr "показать отладочную информацию"
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
-#: builtin/ls-remote.c:9
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
-msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запуск>]\n [-q | --quiet] [--exit-code] [--get-url]\n [--symref] [<репозиторий> [<ссылки>…]]"
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr "вывести всех общих предков"
-#: builtin/ls-remote.c:59
-msgid "do not print remote URL"
-msgstr "не вÑ\8bводиÑ\82Ñ\8c URL внеÑ\88ниÑ\85 Ñ\80епозиÑ\82оÑ\80иев"
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr "вÑ\8bвеÑ\81Ñ\82и пÑ\80едков длÑ\8f одного многоÑ\85одового Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
-msgid "exec"
-msgstr "запÑ\83Ñ\81к"
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок Ñ\80едаÑ\86ий, коÑ\82оÑ\80Ñ\8bе не доÑ\81Ñ\82ижимÑ\8b из дÑ\80Ñ\83г дÑ\80Ñ\83га"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
-msgid "path of git-upload-pack on the remote host"
-msgstr "путь к git-upload-pack на внешнем сервере"
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr "является первым предком второго указанного коммита?"
-#: builtin/ls-remote.c:65
-msgid "limit to tags"
-msgstr "огÑ\80аниÑ\87иÑ\82Ñ\8c вÑ\8bвод меÑ\82ками"
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "найÑ\82и жÑ\83Ñ\80нале Ñ\81Ñ\81Ñ\8bлок <Ñ\81Ñ\81Ñ\8bлка> где именно <коммиÑ\82> Ñ\80азвеÑ\82вилÑ\81Ñ\8f"
-#: builtin/ls-remote.c:66
-msgid "limit to heads"
-msgstr "ограничить вывод указателями на ветки"
+#: 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/ls-remote.c:67
-msgid "do not show peeled tags"
-msgstr "не показÑ\8bваÑ\82Ñ\8c Ñ\83далÑ\91ннÑ\8bе меÑ\82ки"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82 на Ñ\81Ñ\82андаÑ\80Ñ\82нÑ\8bй вÑ\8bвод"
-#: builtin/ls-remote.c:69
-msgid "take url.<base>.insteadOf into account"
-msgstr "учитывать url.<база>.insteadOf"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "использовать diff3 слияние"
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
-msgstr "выходить с кодом 2, если соответствующие ссылки не найдены"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "при возникновении конфликтов, использовать нашу версию"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "при возникновении конфликтов, использовать их версию"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "при возникновении конфликтов, использовать обе версии"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "при возникновении конфликтов, использовать этот размер маркера"
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
-msgstr "показаÑ\82Ñ\8c Ñ\82акже внÑ\83Ñ\82Ñ\80еннÑ\8eÑ\8e Ñ\81Ñ\81Ñ\8bлкÑ\83 в дополнение к обÑ\8aекÑ\82Ñ\83, на коÑ\82оÑ\80Ñ\8bй она Ñ\83казÑ\8bваеÑ\82"
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "не пÑ\80едÑ\83пÑ\80еждаÑ\82Ñ\8c о конÑ\84ликÑ\82аÑ\85"
-#: builtin/ls-tree.c:30
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]"
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "установить метки для файл1/ориг-файл/файл2"
-#: builtin/ls-tree.c:128
-msgid "only show trees"
-msgstr "выводить только деревья"
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
+msgstr "неизвестная опция %s"
-#: builtin/ls-tree.c:130
-msgid "recurse into subtrees"
-msgstr "проходить рекурсивно в поддеревья"
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "не удалось разобрать объект «%s»"
-#: builtin/ls-tree.c:132
-msgid "show trees when recursing"
-msgstr "выводить деревья при рекурсивном проходе"
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "невозможно обработать больше %d базы. Игнорирую %s."
+msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s."
+msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
+msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
-#: builtin/ls-tree.c:135
-msgid "terminate entries with NUL byte"
-msgstr "разделять записи с помощью НУЛЕВОГО байта"
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/ls-tree.c:136
-msgid "include object size"
-msgstr "включить размер объекта"
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "не удалось распознать ссылку «%s»"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
-msgid "list only filenames"
-msgstr "выводить только имена файлов"
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Слияние %s и %s\n"
-#: builtin/ls-tree.c:143
-msgid "use full path names"
-msgstr "использовать полные пути"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/ls-tree.c:145
-msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "ввод отделённый НУЛЕВЫМИ символами"
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
-msgstr "пустой mbox: «%s»"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "допустить отсутствие объектов"
-#: builtin/merge.c:51
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<опции>] [<коммит>…]"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "допустить создание более одного дерева"
-#: builtin/merge.c:52
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
-#: builtin/merge.c:53
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
-#: builtin/merge.c:110
-msgid "switch `m' requires a value"
-msgstr "при указании параметра «m» требуется указать значение"
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr ""
-#: builtin/merge.c:176
+#: builtin/multi-pack-index.c:51
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Не удалось найти стратегию слияния «%s».\n"
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<опции>] <источник>… <назначение>"
-#: builtin/merge.c:177
+#: builtin/mv.c:83
#, c-format
-msgid "Available strategies are:"
-msgstr "Доступные стратегии:"
+msgid "Directory %s is in index and no submodule?"
+msgstr "Каталог %s в индексе и не является подмодулем?"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules"
-#: builtin/merge.c:182
+#: builtin/mv.c:103
#, c-format
-msgid "Available custom strategies are:"
-msgstr "Доступные пользовательские стратегии:"
+msgid "%.*s is in index"
+msgstr "%.*s в индесе"
-#: builtin/merge.c:232 builtin/pull.c:142
-msgid "do not show a diffstat at the end of the merge"
-msgstr "не вÑ\8bводиÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 изменений поÑ\81ле оконÑ\87аниÑ\8f Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "пÑ\80инÑ\83диÑ\82елÑ\8cно пеÑ\80емеÑ\89аÑ\82Ñ\8c/пеÑ\80еименоваÑ\82Ñ\8c, даже еÑ\81ли Ñ\86елÑ\8c Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82"
-#: builtin/merge.c:235 builtin/pull.c:145
-msgid "show a diffstat at the end of the merge"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 изменений поÑ\81ле оконÑ\87аниÑ\8f Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "пÑ\80опÑ\83Ñ\81каÑ\82Ñ\8c оÑ\88ибки пÑ\80и пеÑ\80емеÑ\89ении/пеÑ\80еименовании"
-#: builtin/merge.c:236 builtin/pull.c:148
-msgid "(synonym to --stat)"
-msgstr "(синоним для --stat)"
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "целевой путь «%s» не является каталогом"
-#: builtin/merge.c:238 builtin/pull.c:151
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Проверка переименования из «%s» в «%s»\n"
-#: builtin/merge.c:241 builtin/pull.c:157
-msgid "create a single commit instead of doing a merge"
-msgstr "создать один коммит, вместо выполнения слияния"
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr "плохой источник"
-#: builtin/merge.c:243 builtin/pull.c:160
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr "нельзя переместить каталог в самого себя"
-#: builtin/merge.c:245 builtin/pull.c:163
-msgid "edit message before committing"
-msgstr "оÑ\82Ñ\80едакÑ\82иÑ\80оваÑ\82Ñ\8c Ñ\81ообÑ\89ение пеÑ\80ед вÑ\8bполнением коммиÑ\82а"
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr "нелÑ\8cзÑ\8f пеÑ\80емеÑ\81Ñ\82иÑ\82Ñ\8c каÑ\82алог в Ñ\84айл"
-#: builtin/merge.c:246
-msgid "allow fast-forward (default)"
-msgstr "разрешить перемотку вперед (по умолчанию)"
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr "исходный каталог пуст"
-#: builtin/merge.c:248 builtin/pull.c:169
-msgid "abort if fast-forward is not possible"
-msgstr "оÑ\82мениÑ\82Ñ\8c вÑ\8bполнение Ñ\81лиÑ\8fниÑ\8f, еÑ\81ли пеÑ\80емоÑ\82ка впеÑ\80ед невозможна"
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr "не под веÑ\80Ñ\81ионнÑ\8bм конÑ\82Ñ\80олем"
-#: builtin/merge.c:252 builtin/pull.c:172
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr "целевой путь уже существует"
-#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
-#: builtin/revert.c:110
-msgid "strategy"
-msgstr "стратегия"
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr "перезапись «%s»"
-#: builtin/merge.c:254 builtin/pull.c:177
-msgid "merge strategy to use"
-msgstr "иÑ\81полÑ\8cзÑ\83емаÑ\8f Ñ\81Ñ\82Ñ\80аÑ\82егиÑ\8f Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пеÑ\80езапиÑ\81аÑ\82Ñ\8c"
-#: builtin/merge.c:255 builtin/pull.c:180
-msgid "option=value"
-msgstr "опÑ\86иÑ\8f=знаÑ\87ение"
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr "неÑ\81колÑ\8cко иÑ\81Ñ\82оÑ\87ников длÑ\8f одного Ñ\86елевого пÑ\83Ñ\82и"
-#: builtin/merge.c:256 builtin/pull.c:181
-msgid "option for selected merge strategy"
-msgstr "опции для выбранной стратегии слияния"
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr "целевой каталог не существует"
-#: builtin/merge.c:258
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, откуда=%s, куда=%s"
-#: builtin/merge.c:265
-msgid "abort the current in-progress merge"
-msgstr "отменить выполнение происходящего слияния"
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Переименование %s в %s\n"
-#: builtin/merge.c:267
-msgid "continue the current in-progress merge"
-msgstr "продолжить выполнение происходящего слияния"
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "сбой при переименовании «%s»"
-#: builtin/merge.c:269 builtin/pull.c:188
-msgid "allow merging unrelated histories"
-msgstr "разрешить слияние несвязанных историй изменений"
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<опции>] <коммит>…"
-#: builtin/merge.c:275
-msgid "verify commit-msg hook"
-msgstr "проверить перехватчик commit-msg"
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<опции>] --all"
-#: builtin/merge.c:300
-msgid "could not run stash."
-msgstr "не удалось выполнить stash."
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<опции>] --stdin"
-#: builtin/merge.c:305
-msgid "stash failed"
-msgstr "сбой при выполнении stash"
+#: builtin/name-rev.c:415
+msgid "print only names (no SHA-1)"
+msgstr "выводить только имена (без SHA-1)"
-#: builtin/merge.c:310
-#, c-format
-msgid "not a valid object: %s"
-msgstr "неправильный объект: %s"
+#: builtin/name-rev.c:416
+msgid "only use tags to name the commits"
+msgstr "использовать только метки для именования коммитов"
-#: builtin/merge.c:332 builtin/merge.c:349
-msgid "read-tree failed"
-msgstr "сбой при выполнении read-tree"
+#: builtin/name-rev.c:418
+msgid "only use refs matching <pattern>"
+msgstr "использовать только ссылки, соответствующие <шаблону> "
-#: builtin/merge.c:379
-msgid " (nothing to squash)"
-msgstr " (нечего уплотнять)"
+#: builtin/name-rev.c:420
+msgid "ignore refs matching <pattern>"
+msgstr "игнорировать ссылки, соответствующие <шаблону>"
-#: builtin/merge.c:390
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Уплотнение коммита — не обновляя HEAD\n"
+#: builtin/name-rev.c:422
+msgid "list all commits reachable from all refs"
+msgstr "вывести список всех коммитов, достижимых со всех ссылок"
-#: builtin/merge.c:440
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Нет сообщения слияния — не обновляем HEAD\n"
+#: builtin/name-rev.c:423
+msgid "read from stdin"
+msgstr "прочитать из стандартного ввода"
-#: builtin/merge.c:491
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "«%s» не указывает на коммит"
+#: builtin/name-rev.c:424
+msgid "allow to print `undefined` names (default)"
+msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
-#: builtin/merge.c:578
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Неправильная строка branch.%s.mergeoptions: %s"
+#: builtin/name-rev.c:430
+msgid "dereference tags in the input (internal use)"
+msgstr "разыменовывать введенные метки (для внутреннего использования)"
-#: builtin/merge.c:699
-msgid "Not handling anything other than two heads merge."
-msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]"
-#: builtin/merge.c:713
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Неизвестный параметр merge-recursive: -X%s"
+#: builtin/notes.c:29
+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/merge.c:728
-#, c-format
-msgid "unable to write %s"
-msgstr "не удалось записать %s"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>"
+
+#: builtin/notes.c:31
+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/merge.c:779
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Не удалось прочесть из «%s»"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]"
-#: builtin/merge.c:788
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]"
-#: builtin/merge.c:794
-#, c-format
+#: builtin/notes.c:34
msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n"
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>"
-#: builtin/merge.c:830
-msgid "Empty commit message."
-msgstr "Пустое сообщение коммита."
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
-#: builtin/merge.c:849
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Прекрасно.\n"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
-#: builtin/merge.c:902
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]"
-#: builtin/merge.c:941
-msgid "No current branch."
-msgstr "Нет текущей ветки."
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <имя-заметки>] prune [-n] [-v]"
-#: builtin/merge.c:943
-msgid "No remote for the current branch."
-msgstr "У текущей ветки нет внешнего репозитория."
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <ссылка-на-заметку>] get-ref"
-#: builtin/merge.c:945
-msgid "No default upstream defined for the current branch."
-msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<объект>]]"
-#: builtin/merge.c:950
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<опции>] [<объект>]"
-#: builtin/merge.c:1007
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Плохое значение «%s» в переменной окружения «%s»"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<опции>] <из-объекта> <в-объект>"
-#: builtin/merge.c:1110
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "не является тем, что можно слить в %s: %s"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…"
-#: builtin/merge.c:1144
-msgid "not something we can merge"
-msgstr "не является тем, что можно слить"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<опции>] [<объект>]"
-#: builtin/merge.c:1247
-msgid "--abort expects no arguments"
-msgstr "опция --abort не принимает аргументы"
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<объект>]"
-#: builtin/merge.c:1251
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<объект>]"
-#: builtin/merge.c:1263
-msgid "--continue expects no arguments"
-msgstr "опция --continue не принимает аргументы"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<опции>] <ссылка-на-заметку>"
-#: builtin/merge.c:1267
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<опции>]"
-#: builtin/merge.c:1283
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием."
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<опции>]"
-#: builtin/merge.c:1290
-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/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<опции>]"
-#: builtin/merge.c:1293
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<опции>]"
-#: builtin/merge.c:1302
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Нельзя использовать одновременно --squash и --no-ff."
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
-#: builtin/merge.c:1310
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Ð\9aоммиÑ\82 не Ñ\83казан и паÑ\80амеÑ\82Ñ\80 merge.defaultToUpstream не Ñ\83Ñ\81Ñ\82ановлен."
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "Ð\97апиÑ\81аÑ\82Ñ\8c/измениÑ\82Ñ\8c замеÑ\82ки длÑ\8f Ñ\81ледÑ\83Ñ\8eÑ\89его обÑ\8aекÑ\82а:"
-#: builtin/merge.c:1327
-msgid "Squash commit into empty head not supported yet"
-msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "не удалось запустить «show» для объекта «%s»"
-#: builtin/merge.c:1329
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Ð\9aоммиÑ\82, не Ñ\8fвлÑ\8fÑ\8eÑ\89ийÑ\81Ñ\8f пеÑ\80емоÑ\82кой впеÑ\80ед, неÑ\82 Ñ\81мÑ\8bÑ\81ла делаÑ\82Ñ\8c в пÑ\83Ñ\81Ñ\82Ñ\83Ñ\8e веÑ\82кÑ\83."
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c вÑ\8bвод «show»"
-#: builtin/merge.c:1334
+#: builtin/notes.c:162
#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s не является тем, что можно слить"
+msgid "failed to finish 'show' for object '%s'"
+msgstr "не удалось завершить «show» для объекта «%s»"
-#: builtin/merge.c:1336
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Можно только один коммит в пустую ветку."
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "пожалуйста, укажите содержимое заметки, используя опцию -m или -F"
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "не удалось записать объект заметки"
-#: builtin/merge.c:1370
+#: builtin/notes.c:208
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
+msgid "the note contents have been left in %s"
+msgstr "содержимое заметки осталось в %s"
-#: builtin/merge.c:1373
+#: builtin/notes.c:242 builtin/tag.c:522
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Ð\9aоммиÑ\82 %s Ñ\81одеÑ\80жиÑ\82 плоÑ\85Ñ\83Ñ\8e GPG подпиÑ\81Ñ\8c, пÑ\80едположиÑ\82елÑ\8cно оÑ\82 %s."
+msgid "could not open or read '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c оÑ\82кÑ\80Ñ\8bÑ\82Ñ\8c или пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c «%s»"
-#: builtin/merge.c:1376
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Ð\9aоммиÑ\82 %s не Ñ\81одеÑ\80жиÑ\82 GPG подпиÑ\81Ñ\8c."
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c «%s» как Ñ\81Ñ\81Ñ\8bлкÑ\83."
-#: builtin/merge.c:1379
+#: builtin/notes.c:265
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Ð\9aоммиÑ\82 %s Ñ\81одеÑ\80жиÑ\82 дейÑ\81Ñ\82виÑ\82елÑ\8cнÑ\83Ñ\8e GPG подпиÑ\81Ñ\8c, оÑ\82 %s.\n"
+msgid "failed to read object '%s'."
+msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82 «%s»."
-#: builtin/merge.c:1438
-msgid "refusing to merge unrelated histories"
-msgstr "отказ слияния несвязанных историй изменений"
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
-#: builtin/merge.c:1447
-msgid "Already up to date."
-msgstr "Уже обновлено."
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "неправильная введенная строка: «%s»."
-#: builtin/merge.c:1457
+#: builtin/notes.c:324
#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Ð\9eбновление %s..%s\n"
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\81копиÑ\80оваÑ\82Ñ\8c замеÑ\82кÑ\83 из «%s» в «%s»"
-#: builtin/merge.c:1498
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:356
#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Попытка тривиального слияния в индексе…\n"
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)"
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr "передано слишком много параметров"
-#: builtin/merge.c:1505
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
-msgid "Nope.\n"
-msgstr "Ð\9dе вÑ\8bÑ\88ло.\n"
+msgid "no note found for object %s."
+msgstr "не найдена замеÑ\82ка длÑ\8f обÑ\8aекÑ\82а %s."
-#: builtin/merge.c:1530
-msgid "Already up to date. Yeeah!"
-msgstr "Уже обновлено. Круто!"
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "текстовое содержимое заметки"
-#: builtin/merge.c:1536
-msgid "Not possible to fast-forward, aborting."
-msgstr "Перемотка вперед невозможна, отмена."
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "содержимое заметки в файле"
-#: builtin/merge.c:1559 builtin/merge.c:1638
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Перемотка дерева к исходному состоянию…\n"
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "использовать и отредактировать указанный объект заметки"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "использовать указанный объект заметки"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "разрешить сохранение пустой заметки"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "заменить существующие заметки"
-#: builtin/merge.c:1563
+#: builtin/notes.c:448
#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Попытка слияния с помощью стратегии %s…\n"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/merge.c:1629
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Ð\9dи одна Ñ\81Ñ\82Ñ\80аÑ\82егиÑ\8f Ñ\81лиÑ\8fниÑ\8f не обÑ\80абоÑ\82ала Ñ\81лиÑ\8fние.\n"
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Ð\9fеÑ\80езапиÑ\81Ñ\8c Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89иÑ\85 замеÑ\82ок Ñ\83 обÑ\8aекÑ\82а %s\n"
-#: builtin/merge.c:1631
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Сбой при слиянии с помощью стратегии %s.\n"
+msgid "Removing note for object %s\n"
+msgstr "Удаление заметки у объекта %s\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "прочитать объекты из стандартного ввода"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
-#: builtin/merge.c:1640
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr "передано слишком мало параметров"
+
+#: builtin/notes.c:538
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
+" existing notes"
+msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/merge.c:1652
+#: builtin/notes.c:550
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81кое Ñ\81лиÑ\8fние пÑ\80оÑ\88ло Ñ\83Ñ\81пеÑ\88но; как и запÑ\80аÑ\88ивали, оÑ\81Ñ\82ановлено пеÑ\80ед вÑ\8bполнением коммиÑ\82а\n"
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "неÑ\82 замеÑ\82ок Ñ\83 иÑ\81Ñ\85одного обÑ\8aекÑ\82а %s. Ð\9dелÑ\8cзÑ\8f Ñ\81копиÑ\80оваÑ\82Ñ\8c."
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
+#: builtin/notes.c:603
+#, 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/merge-base.c:32
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <коммит>…"
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
-#: builtin/merge-base.c:33
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <коммит>…"
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
-#: builtin/merge-base.c:34
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <коммит> <коммит>"
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "не удалось удалить рабочий каталог «git notes merge»"
-#: builtin/merge-base.c:35
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
-#: builtin/merge-base.c:221
-msgid "output all common ancestors"
-msgstr "вÑ\8bвеÑ\81Ñ\82и вÑ\81еÑ\85 обÑ\89иÑ\85 пÑ\80едков"
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "не Ñ\83далоÑ\81Ñ\8c найÑ\82и коммиÑ\82 из NOTES_MERGE_PARTIAL."
-#: builtin/merge-base.c:223
-msgid "find ancestors for a single n-way merge"
-msgstr "вÑ\8bвеÑ\81Ñ\82и пÑ\80едков длÑ\8f одного многоÑ\85одового Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азобÑ\80аÑ\82Ñ\8c коммиÑ\82 из NOTES_MERGE_PARTIAL."
-#: builtin/merge-base.c:225
-msgid "list revs not reachable from others"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок Ñ\80едаÑ\86ий, коÑ\82оÑ\80Ñ\8bе не доÑ\81Ñ\82ижимÑ\8b из дÑ\80Ñ\83г дÑ\80Ñ\83га"
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "не Ñ\83далоÑ\81Ñ\8c Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c NOTES_MERGE_REF"
-#: builtin/merge-base.c:227
-msgid "is the first one ancestor of the other?"
-msgstr "является первым предком второго указанного коммита?"
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "не удалось завершить слиние заметок"
-#: builtin/merge-base.c:229
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "неизвестная стратегия слияния заметок %s"
-#: 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/notes.c:784
+msgid "General options"
+msgstr "Общие опции"
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82 на Ñ\81Ñ\82андаÑ\80Ñ\82нÑ\8bй вÑ\8bвод"
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "Ð\9eпÑ\86ии Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
-msgstr "использовать diff3 слияние"
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy "
+"(manual/ours/theirs/union/cat_sort_uniq)"
+msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)"
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
-msgstr "пÑ\80и возникновении конÑ\84ликÑ\82ов, иÑ\81полÑ\8cзоваÑ\82Ñ\8c наÑ\88Ñ\83 веÑ\80Ñ\81иÑ\8e"
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "Ð\9aоммиÑ\82 не Ñ\81лиÑ\82Ñ\8bÑ\85 замеÑ\82ок"
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
-msgstr "пÑ\80и возникновении конÑ\84ликÑ\82ов, иÑ\81полÑ\8cзоваÑ\82Ñ\8c иÑ\85 веÑ\80Ñ\81иÑ\8e"
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "завеÑ\80Ñ\88иÑ\82Ñ\8c Ñ\81лиÑ\8fние замеÑ\82ок коммиÑ\82ом не Ñ\81лиÑ\82Ñ\8bÑ\85 замеÑ\82ок"
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
-msgstr "пÑ\80и возникновении конÑ\84ликÑ\82ов, иÑ\81полÑ\8cзоваÑ\82Ñ\8c обе веÑ\80Ñ\81ии"
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Ð\9eÑ\82мена Ñ\80азÑ\80еÑ\88ениÑ\8f Ñ\81лиÑ\8fниÑ\8f замеÑ\82ок"
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
-msgstr "пÑ\80и возникновении конÑ\84ликÑ\82ов, иÑ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 Ñ\80азмеÑ\80 маÑ\80кеÑ\80а"
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "оÑ\82мениÑ\82Ñ\8c Ñ\81лиÑ\8fние замеÑ\82ок"
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
-msgstr "не предупреждать о конфликтах"
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
-msgstr "установить метки для файл1/ориг-файл/файл2"
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "вы должны указать ссылку заметки для слияния"
-#: builtin/merge-recursive.c:45
+#: builtin/notes.c:836
#, c-format
-msgid "unknown option %s"
-msgstr "неизвестная опция %s"
+msgid "unknown -s/--strategy: %s"
+msgstr "неизвестный параметр для -s/--strategy: %s"
-#: builtin/merge-recursive.c:51
+#: builtin/notes.c:873
#, c-format
-msgid "could not parse object '%s'"
-msgstr "не удалось разобрать объект «%s»"
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "слияние заметок в %s уже выполняется на %s"
-#: builtin/merge-recursive.c:55
+#: builtin/notes.c:876
#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "невозможно обработать больше %d базы. Игнорирую %s."
-msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s."
-msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
-msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
-msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
+msgid "failed to store link to current notes ref (%s)"
+msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/notes.c:878
#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "не удалось распознать ссылку «%s»"
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
+" 'git notes merge --commit', or abort the merge with 'git notes merge "
+"--abort'.\n"
+msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
-#: builtin/merge-recursive.c:77
+#: builtin/notes.c:897 builtin/tag.c:535
#, c-format
-msgid "Merging %s with %s\n"
-msgstr "СлиÑ\8fние %s и %s\n"
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c «%s» как Ñ\81Ñ\81Ñ\8bлкÑ\83."
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "У объекта %s нет заметки\n"
-#: builtin/mktree.c:154
-msgid "input is NUL terminated"
-msgstr "ввод оÑ\82делÑ\91ннÑ\8bй Ð\9dУÐ\9bÐ\95Ð\92ЫÐ\9cÐ\98 Ñ\81имволами"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "попÑ\8bÑ\82ка Ñ\83далениÑ\8f неÑ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ей замеÑ\82ки не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f оÑ\88ибкой"
-#: builtin/mktree.c:155 builtin/write-tree.c:25
-msgid "allow missing objects"
-msgstr "допÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вие обÑ\8aекÑ\82ов"
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c имена обÑ\8aекÑ\82ов из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
-#: builtin/mktree.c:156
-msgid "allow creation of more than one tree"
-msgstr "допÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\81оздание более одного деÑ\80ева"
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr "не Ñ\83далÑ\8fÑ\82Ñ\8c, Ñ\82олÑ\8cко показаÑ\82Ñ\8c Ñ\81пиÑ\81ок"
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<опции>] <источник>… <назначение>"
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "вывести список удаленных заметок"
-#: builtin/mv.c:82
-#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr "Каталог %s в индексе и не является подмодулем?"
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "ссылка-на-заметку"
-#: builtin/mv.c:84
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "ЧÑ\82обÑ\8b пÑ\80одолжиÑ\82Ñ\8c, пÑ\80оиндекÑ\81иÑ\80Ñ\83йÑ\82е или Ñ\81пÑ\80Ñ\8fÑ\87Ñ\8cÑ\82е ваÑ\88и изменениÑ\8f в Ñ\84айле .gitmodules"
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c замеÑ\82кÑ\83 из <Ñ\81Ñ\81Ñ\8bлка-на-замеÑ\82кÑ\83>"
-#: builtin/mv.c:102
+#: builtin/notes.c:1034 builtin/stash.c:1611
#, c-format
-msgid "%.*s is in index"
-msgstr "%.*s в индесе"
+msgid "unknown subcommand: %s"
+msgstr "неизвестная подкоманда: %s"
-#: builtin/mv.c:124
-msgid "force move/rename even if target exists"
-msgstr "принудительно перемещать/переименовать, даже если цель существует"
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
-msgstr "пропускать ошибки при перемещении/переименовании"
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
-#: builtin/mv.c:168
+#: builtin/pack-objects.c:424
#, c-format
-msgid "destination '%s' is not a directory"
-msgstr "целевой путь «%s» не является каталогом"
+msgid "bad packed object CRC for %s"
+msgstr ""
-#: builtin/mv.c:179
+#: builtin/pack-objects.c:435
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr "Проверка переименования из «%s» в «%s»\n"
-
-#: builtin/mv.c:183
-msgid "bad source"
-msgstr "плохой источник"
-
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
-msgstr "нельзя переместить каталог в самого себя"
-
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
-msgstr "нельзя переместить каталог в файл"
+msgid "corrupt packed object for %s"
+msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
-msgstr "исходный каталог пуст"
+#: builtin/pack-objects.c:566
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
-msgstr "не под версионным контролем"
+#: builtin/pack-objects.c:777
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
-msgstr "целевой путь уже существует"
+#: builtin/pack-objects.c:790
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
-#: builtin/mv.c:234
+#: builtin/pack-objects.c:794
#, c-format
-msgid "overwriting '%s'"
-msgstr "перезапись «%s»"
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
-msgstr "Не удалось перезаписать"
+#: builtin/pack-objects.c:798
+msgid "unable to seek in reused packfile"
+msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
-msgstr "несколько источников для одного целевого пути"
+#: builtin/pack-objects.c:809
+msgid "unable to read from reused packfile"
+msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
-msgstr "целевой каталог не существует"
+#: builtin/pack-objects.c:837
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
-msgstr "%s, откуда=%s, куда=%s"
+#: builtin/pack-objects.c:850
+msgid "Writing objects"
+msgstr "Запись объектов"
-#: builtin/mv.c:270
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
#, c-format
-msgid "Renaming %s to %s\n"
-msgstr "Ð\9fеÑ\80еименование %s в %s\n"
+msgid "failed to stat %s"
+msgstr "не Ñ\83далоÑ\81Ñ\8c вÑ\8bполниÑ\82Ñ\8c stat %s"
-#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
+#: builtin/pack-objects.c:965
#, c-format
-msgid "renaming '%s' failed"
-msgstr "сбой при переименовании «%s»"
-
-#: builtin/name-rev.c:355
-msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<опции>] <коммит>…"
-
-#: builtin/name-rev.c:356
-msgid "git name-rev [<options>] --all"
-msgstr "git name-rev [<опции>] --all"
-
-#: builtin/name-rev.c:357
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<опции>] --stdin"
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
-#: builtin/name-rev.c:413
-msgid "print only names (no SHA-1)"
-msgstr "вÑ\8bводиÑ\82Ñ\8c Ñ\82олÑ\8cко имена (без SHA-1)"
+#: builtin/pack-objects.c:1161
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "оÑ\82клÑ\8eÑ\87ение запиÑ\81и биÑ\82овÑ\8bÑ\85 каÑ\80Ñ\82, Ñ\82ак как некоÑ\82оÑ\80Ñ\8bе обÑ\8aекÑ\82Ñ\8b не бÑ\8bли Ñ\83пакованÑ\8b"
-#: builtin/name-rev.c:414
-msgid "only use tags to name the commits"
-msgstr "использовать только метки для именования коммитов"
+#: builtin/pack-objects.c:1589
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
-#: builtin/name-rev.c:416
-msgid "only use refs matching <pattern>"
-msgstr "использовать только ссылки, соответствующие <шаблону> "
+#: builtin/pack-objects.c:1598
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
-#: builtin/name-rev.c:418
-msgid "ignore refs matching <pattern>"
-msgstr "игноÑ\80иÑ\80оваÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлки, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ие <Ñ\88аблонÑ\83>"
+#: builtin/pack-objects.c:1867
+msgid "Counting objects"
+msgstr "Ð\9fодÑ\81Ñ\87еÑ\82 обÑ\8aекÑ\82ов"
-#: builtin/name-rev.c:420
-msgid "list all commits reachable from all refs"
-msgstr "вывести список всех коммитов, достижимых со всех ссылок"
+#: builtin/pack-objects.c:1997
+#, c-format
+msgid "unable to get size of %s"
+msgstr "не удалось получить размер %s"
-#: builtin/name-rev.c:421
-msgid "read from stdin"
-msgstr "прочитать из стандартного ввода"
+#: builtin/pack-objects.c:2012
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "не удалось разобрать заголовок объекта %s"
-#: builtin/name-rev.c:422
-msgid "allow to print `undefined` names (default)"
-msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
+#: builtin/pack-objects.c:2108
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
-#: builtin/name-rev.c:428
-msgid "dereference tags in the input (internal use)"
-msgstr "разыменовывать введенные метки (для внутреннего использования)"
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]"
+#: builtin/pack-objects.c:2122
+msgid "suboptimal pack - out of memory"
+msgstr ""
-#: builtin/notes.c:29
-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/pack-objects.c:2448
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "При сжатии изменений используется до %d потоков"
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>"
+#: builtin/pack-objects.c:2580
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
-#: builtin/notes.c:31
-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/pack-objects.c:2667
+msgid "Compressing objects"
+msgstr "Сжатие объектов"
-#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]"
+#: builtin/pack-objects.c:2673
+msgid "inconsistency with delta count"
+msgstr ""
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]"
+#: builtin/pack-objects.c:2754
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
-#: builtin/notes.c:34
+#: builtin/pack-objects.c:2760
+#, c-format
msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>"
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
+#: builtin/pack-objects.c:2858
+msgid "invalid value for --missing"
+msgstr "недопустимое значение для --missing"
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+msgid "cannot open pack index"
+msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]"
+#: builtin/pack-objects.c:2948
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
-#: builtin/notes.c:38
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr "git notes [--ref <имя-заметки>] prune [-n] [-v]"
+#: builtin/pack-objects.c:3033
+msgid "unable to force loose object"
+msgstr ""
-#: builtin/notes.c:39
-msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <ссылка-на-заметку>] get-ref"
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
-#: builtin/notes.c:44
-msgid "git notes [list [<object>]]"
-msgstr "git notes [list [<объект>]]"
+#: builtin/pack-objects.c:3128
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
-#: builtin/notes.c:49
-msgid "git notes add [<options>] [<object>]"
-msgstr "git notes add [<опции>] [<объект>]"
+#: builtin/pack-objects.c:3153
+msgid "unable to add recent objects"
+msgstr ""
-#: builtin/notes.c:54
-msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<опции>] <из-объекта> <в-объект>"
+#: builtin/pack-objects.c:3206
+#, c-format
+msgid "unsupported index version %s"
+msgstr "неподдерживаемая версия индекса %s"
-#: builtin/notes.c:55
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…"
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "bad index version '%s'"
+msgstr "плохая версия индекса «%s»"
-#: builtin/notes.c:60
-msgid "git notes append [<options>] [<object>]"
-msgstr "git notes append [<опции>] [<объект>]"
+#: builtin/pack-objects.c:3240
+msgid "do not show progress meter"
+msgstr "не выводить прогресс выполнения"
-#: builtin/notes.c:65
-msgid "git notes edit [<object>]"
-msgstr "git notes edit [<объект>]"
+#: builtin/pack-objects.c:3242
+msgid "show progress meter"
+msgstr "показать прогресс выполнения"
-#: builtin/notes.c:70
-msgid "git notes show [<object>]"
-msgstr "git notes show [<объект>]"
+#: builtin/pack-objects.c:3244
+msgid "show progress meter during object writing phase"
+msgstr "показать прогресс выполнения во время записи объектов"
-#: builtin/notes.c:75
-msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<опции>] <ссылка-на-заметку>"
+#: builtin/pack-objects.c:3247
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "похоже на --all-progress при включенном прогрессе выполнения"
-#: builtin/notes.c:76
-msgid "git notes merge --commit [<options>]"
-msgstr "git notes merge --commit [<опции>]"
+#: builtin/pack-objects.c:3248
+msgid "<version>[,<offset>]"
+msgstr ""
-#: builtin/notes.c:77
-msgid "git notes merge --abort [<options>]"
-msgstr "git notes merge --abort [<опции>]"
+#: builtin/pack-objects.c:3249
+msgid "write the pack index file in the specified idx format version"
+msgstr "записать файл индекса пакета в указанной версии формата"
-#: builtin/notes.c:82
-msgid "git notes remove [<object>]"
-msgstr "git notes remove [<опции>]"
+#: builtin/pack-objects.c:3252
+msgid "maximum size of each output pack file"
+msgstr "максимальный размер каждого выходного файла пакета"
-#: builtin/notes.c:87
-msgid "git notes prune [<options>]"
-msgstr "git notes prune [<опции>]"
+#: builtin/pack-objects.c:3254
+msgid "ignore borrowed objects from alternate object store"
+msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
+#: builtin/pack-objects.c:3256
+msgid "ignore packed objects"
+msgstr "игнорировать упакованные объекты"
-#: builtin/notes.c:97
-msgid "Write/edit the notes for the following object:"
-msgstr "Ð\97апиÑ\81аÑ\82Ñ\8c/измениÑ\82Ñ\8c замеÑ\82ки длÑ\8f Ñ\81ледÑ\83Ñ\8eÑ\89его обÑ\8aекÑ\82а:"
+#: builtin/pack-objects.c:3258
+msgid "limit pack window by objects"
+msgstr "огÑ\80аниÑ\87иÑ\82Ñ\8c окно пакеÑ\82а по колиÑ\87еÑ\81Ñ\82вÑ\83 обÑ\8aекÑ\82ов"
-#: builtin/notes.c:150
-#, c-format
-msgid "unable to start 'show' for object '%s'"
-msgstr "не удалось запустить «show» для объекта «%s»"
+#: builtin/pack-objects.c:3260
+msgid "limit pack window by memory in addition to object limit"
+msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
-#: builtin/notes.c:154
-msgid "could not read 'show' output"
-msgstr "не Ñ\83далоÑ\81Ñ\8c пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c вÑ\8bвод «show»"
+#: builtin/pack-objects.c:3262
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "макÑ\81ималÑ\8cнаÑ\8f Ñ\80азÑ\80еÑ\88еннаÑ\8f длина Ñ\86епоÑ\87ки делÑ\8cÑ\82 в Ñ\80езÑ\83лÑ\8cÑ\82иÑ\80Ñ\83Ñ\8eÑ\89ем пакеÑ\82е"
-#: builtin/notes.c:162
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
-msgstr "не удалось завершить «show» для объекта «%s»"
+#: builtin/pack-objects.c:3264
+msgid "reuse existing deltas"
+msgstr "использовать повторно существующие дельты"
-#: builtin/notes.c:197
-msgid "please supply the note contents using either -m or -F option"
-msgstr "пожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е Ñ\81одеÑ\80жимое замеÑ\82ки, иÑ\81полÑ\8cзÑ\83Ñ\8f опÑ\86иÑ\8e -m или -F"
+#: builtin/pack-objects.c:3266
+msgid "reuse existing objects"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c повÑ\82оÑ\80но Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ие обÑ\8aекÑ\82Ñ\8b"
-#: builtin/notes.c:206
-msgid "unable to write note object"
-msgstr "не Ñ\83далоÑ\81Ñ\8c запиÑ\81аÑ\82Ñ\8c обÑ\8aекÑ\82 замеÑ\82ки"
+#: builtin/pack-objects.c:3268
+msgid "use OFS_DELTA objects"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b OFS_DELTA"
-#: builtin/notes.c:208
-#, c-format
-msgid "the note contents have been left in %s"
-msgstr "содержимое заметки осталось в %s"
+#: builtin/pack-objects.c:3270
+msgid "use threads when searching for best delta matches"
+msgstr "использовать многопоточность при поиске лучших совпадений дельт"
-#: builtin/notes.c:236 builtin/tag.c:508
-#, c-format
-msgid "cannot read '%s'"
-msgstr "не удалось прочитать «%s»"
+#: builtin/pack-objects.c:3272
+msgid "do not create an empty pack output"
+msgstr "не создавать пустые выходные пакеты"
-#: builtin/notes.c:238 builtin/tag.c:511
-#, c-format
-msgid "could not open or read '%s'"
-msgstr "не удалось открыть или прочитать «%s»"
+#: builtin/pack-objects.c:3274
+msgid "read revision arguments from standard input"
+msgstr "прочитать аргументы редакций из стандартного ввода"
-#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
-#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
-#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
-msgstr "не удалось разрешить «%s» как ссылку."
+#: builtin/pack-objects.c:3276
+msgid "limit the objects to those that are not yet packed"
+msgstr "ограничиться объектами, которые еще не упакованы"
-#: builtin/notes.c:260
-#, c-format
-msgid "failed to read object '%s'."
-msgstr "не удалось прочитать объект «%s»."
+#: builtin/pack-objects.c:3279
+msgid "include objects reachable from any reference"
+msgstr "включить объекты, которые достижимы по любой из ссылок"
-#: builtin/notes.c:264
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
-msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
+#: builtin/pack-objects.c:3282
+msgid "include objects referred by reflog entries"
+msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
-#: builtin/notes.c:304
-#, c-format
-msgid "malformed input line: '%s'."
-msgstr "неправильная введенная строка: «%s»."
+#: builtin/pack-objects.c:3285
+msgid "include objects referred to by the index"
+msgstr "включить объекты, на которые ссылается индекс"
-#: builtin/notes.c:319
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
-msgstr "не удалось скопировать заметку из «%s» в «%s»"
+#: builtin/pack-objects.c:3288
+msgid "output pack to stdout"
+msgstr "вывести пакет на стандартный вывод"
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:351
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
-msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)"
+#: builtin/pack-objects.c:3290
+msgid "include tag objects that refer to objects to be packed"
+msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
-#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
-#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
-#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975
-msgid "too many parameters"
-msgstr "передано слишком много параметров"
+#: builtin/pack-objects.c:3292
+msgid "keep unreachable objects"
+msgstr "сохранять ссылки на недоступные объекты"
-#: builtin/notes.c:384 builtin/notes.c:670
-#, c-format
-msgid "no note found for object %s."
-msgstr "не найдена заметка для объекта %s."
+#: builtin/pack-objects.c:3294
+msgid "pack loose unreachable objects"
+msgstr "паковать недостижимые объекты"
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents as a string"
-msgstr "Ñ\82екÑ\81Ñ\82овое Ñ\81одеÑ\80жимое замеÑ\82ки"
+#: builtin/pack-objects.c:3296
+msgid "unpack unreachable objects newer than <time>"
+msgstr "Ñ\80аÑ\81паковаÑ\82Ñ\8c недоÑ\81Ñ\82Ñ\83пнÑ\8bе обÑ\8aекÑ\82Ñ\8b, коÑ\82оÑ\80Ñ\8bе новее, Ñ\87ем <вÑ\80емÑ\8f>"
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "note contents in a file"
-msgstr "содержимое заметки в файле"
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
+msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse and edit specified note object"
-msgstr "использовать и отредактировать указанный объект заметки"
+#: builtin/pack-objects.c:3301
+msgid "create thin packs"
+msgstr "создавать тонкие пакеты"
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "reuse specified note object"
-msgstr "использовать указанный объект заметки"
+#: builtin/pack-objects.c:3303
+msgid "create packs suitable for shallow fetches"
+msgstr "создавать пакеты, подходящие для частичных извлечений"
-#: builtin/notes.c:417 builtin/notes.c:580
-msgid "allow storing empty note"
-msgstr "разрешить сохранение пустой заметки"
+#: builtin/pack-objects.c:3305
+msgid "ignore packs that have companion .keep file"
+msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
-#: builtin/notes.c:418 builtin/notes.c:489
-msgid "replace existing notes"
-msgstr "замениÑ\82Ñ\8c Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ие замеÑ\82ки"
+#: builtin/pack-objects.c:3307
+msgid "ignore this pack"
+msgstr "игноÑ\80иÑ\80оваÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 пакеÑ\82"
-#: builtin/notes.c:443
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
+#: builtin/pack-objects.c:3309
+msgid "pack compression level"
+msgstr "уровень сжатия пакета"
-#: builtin/notes.c:458 builtin/notes.c:537
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr "Перезапись существующих заметок у объекта %s\n"
+#: builtin/pack-objects.c:3311
+msgid "do not hide commits by grafts"
+msgstr "не скрывать коммиты сращениями"
-#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr "Удаление заметки у объекта %s\n"
+#: builtin/pack-objects.c:3313
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
-#: builtin/notes.c:490
-msgid "read objects from stdin"
-msgstr "пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b из Ñ\81Ñ\82андаÑ\80Ñ\82ного ввода"
+#: builtin/pack-objects.c:3315
+msgid "write a bitmap index together with the pack index"
+msgstr "запиÑ\81Ñ\8c индекÑ\81а в биÑ\82овÑ\8bÑ\85 каÑ\80Ñ\82аÑ\85 вмеÑ\81Ñ\82е Ñ\81 индекÑ\81ом пакеÑ\82а"
-#: builtin/notes.c:492
-msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "загÑ\80Ñ\83зиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки пеÑ\80езапиÑ\81и длÑ\8f командÑ\8b <команда> (вклÑ\8eÑ\87аеÑ\82 в Ñ\81ебÑ\8f --stdin)"
+#: builtin/pack-objects.c:3318
+msgid "handling for missing objects"
+msgstr "обÑ\80абоÑ\82ка оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89иÑ\85 обÑ\8aекÑ\82ов"
-#: builtin/notes.c:510
-msgid "too few parameters"
-msgstr "пеÑ\80едано Ñ\81лиÑ\88ком мало паÑ\80амеÑ\82Ñ\80ов"
+#: builtin/pack-objects.c:3321
+msgid "do not pack objects in promisor packfiles"
+msgstr "не Ñ\83паковÑ\8bваÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b в promisor Ñ\84айлÑ\8b пакеÑ\82ов"
-#: builtin/notes.c:531
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
-" existing notes"
-msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
+msgstr ""
-#: builtin/notes.c:543
+#: builtin/pack-objects.c:3348
#, c-format
-msgid "missing notes on source object %s. Cannot copy."
-msgstr "неÑ\82 замеÑ\82ок Ñ\83 иÑ\81Ñ\85одного обÑ\8aекÑ\82а %s. Ð\9dелÑ\8cзÑ\8f Ñ\81копиÑ\80оваÑ\82Ñ\8c."
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "глÑ\83бина Ñ\86епоÑ\87ки изменений %d Ñ\81лиÑ\88ком болÑ\8cÑ\88аÑ\8f, иÑ\81полÑ\8cзÑ\83Ñ\8e пÑ\80инÑ\83диÑ\82елÑ\8cно %d"
-#: builtin/notes.c:595
+#: builtin/pack-objects.c:3353
#, 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:690
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
-
-#: builtin/notes.c:692
-msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d"
-#: builtin/notes.c:694
-msgid "failed to remove 'git notes merge' worktree"
-msgstr "не удалось удалить рабочий каталог «git notes merge»"
+#: builtin/pack-objects.c:3407
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
-#: builtin/notes.c:714
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
+#: builtin/pack-objects.c:3409
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
-#: builtin/notes.c:716
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
+#: builtin/pack-objects.c:3414
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
-#: builtin/notes.c:718
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
+#: builtin/pack-objects.c:3417
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
-#: builtin/notes.c:731
-msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "не удалось разрешить NOTES_MERGE_REF"
+#: builtin/pack-objects.c:3423
+msgid "cannot use --filter without --stdout"
+msgstr ""
-#: builtin/notes.c:734
-msgid "failed to finalize notes merge"
-msgstr "не Ñ\83далоÑ\81Ñ\8c завеÑ\80Ñ\88иÑ\82Ñ\8c Ñ\81линие замеÑ\82ок"
+#: builtin/pack-objects.c:3484
+msgid "Enumerating objects"
+msgstr "Ð\9fеÑ\80еÑ\87иÑ\81ление обÑ\8aекÑ\82ов"
-#: builtin/notes.c:760
+#: builtin/pack-objects.c:3514
#, c-format
-msgid "unknown notes merge strategy %s"
-msgstr "неизвеÑ\81Ñ\82наÑ\8f Ñ\81Ñ\82Ñ\80аÑ\82егиÑ\8f Ñ\81лиÑ\8fниÑ\8f замеÑ\82ок %s"
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr "Ð\92Ñ\81его %<PRIu32> (изменениÑ\8f %<PRIu32>), повÑ\82оÑ\80но иÑ\81полÑ\8cзовано %<PRIu32> (изменениÑ\8f %<PRIu32>)"
-#: builtin/notes.c:776
-msgid "General options"
-msgstr "Общие опции"
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<опции>]"
-#: builtin/notes.c:778
-msgid "Merge options"
-msgstr "Ð\9eпÑ\86ии Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "паковаÑ\82Ñ\8c вÑ\81Ñ\91"
-#: builtin/notes.c:780
-msgid ""
-"resolve notes conflicts using the given strategy "
-"(manual/ours/theirs/union/cat_sort_uniq)"
-msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)"
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "почистить слабые ссылки (по умолчанию)"
-#: builtin/notes.c:782
-msgid "Committing unmerged notes"
-msgstr "Коммит не слитых заметок"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/notes.c:784
-msgid "finalize notes merge by committing unmerged notes"
-msgstr "завеÑ\80Ñ\88иÑ\82Ñ\8c Ñ\81лиÑ\8fние замеÑ\82ок коммиÑ\82ом не Ñ\81лиÑ\82Ñ\8bÑ\85 замеÑ\82ок"
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr "Удаление дÑ\83блиÑ\80Ñ\83Ñ\8eÑ\89иÑ\85Ñ\81Ñ\8f обÑ\8aекÑ\82ов"
-#: builtin/notes.c:786
-msgid "Aborting notes merge resolution"
-msgstr "Отмена разрешения слияния заметок"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<редакция>…]"
-#: builtin/notes.c:788
-msgid "abort notes merge"
-msgstr "оÑ\82мениÑ\82Ñ\8c Ñ\81лиÑ\8fние замеÑ\82ок"
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок Ñ\83даленнÑ\8bÑ\85 обÑ\8aекÑ\82ов"
-#: builtin/notes.c:799
-msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr "удалить объекты старее чем <дата-окончания>"
-#: builtin/notes.c:804
-msgid "must specify a notes ref to merge"
-msgstr "вÑ\8b должнÑ\8b Ñ\83казаÑ\82Ñ\8c Ñ\81Ñ\81Ñ\8bлкÑ\83 замеÑ\82ки длÑ\8f Ñ\81лиÑ\8fниÑ\8f"
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "огÑ\80аниÑ\87иÑ\82Ñ\8c обÑ\85од обÑ\8aекÑ\82ами вне promisor Ñ\84айлов пакеÑ\82ов"
-#: builtin/notes.c:828
-#, c-format
-msgid "unknown -s/--strategy: %s"
-msgstr "неизвестный параметр для -s/--strategy: %s"
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
-#: builtin/notes.c:865
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
-msgstr "слияние заметок в %s уже выполняется на %s"
+msgid "Invalid value for %s: %s"
+msgstr "Неправильное значение %s: %s"
-#: builtin/notes.c:868
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
-msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/notes.c:870
-#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
-" 'git notes merge --commit', or abort the merge with 'git notes merge "
-"--abort'.\n"
-msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
+#: builtin/pull.c:140
+msgid "control for recursive fetching of submodules"
+msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/notes.c:892
-#, c-format
-msgid "Object %s has no note\n"
-msgstr "У объекта %s нет заметки\n"
+#: builtin/pull.c:144
+msgid "Options related to merging"
+msgstr "Опции, связанные со слиянием"
-#: builtin/notes.c:904
-msgid "attempt to remove non-existent note is not an error"
-msgstr "попÑ\8bÑ\82ка Ñ\83далениÑ\8f неÑ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ей замеÑ\82ки не Ñ\8fвлÑ\8fеÑ\82Ñ\81Ñ\8f оÑ\88ибкой"
+#: builtin/pull.c:147
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "забÑ\80аÑ\82Ñ\8c изменениÑ\8f Ñ\81 помоÑ\89Ñ\8cÑ\8e пеÑ\80емеÑ\89ениÑ\8f, а не Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/notes.c:907
-msgid "read object names from the standard input"
-msgstr "прочитать имена объектов из стандартного ввода"
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+msgid "allow fast-forward"
+msgstr "разрешить перемотку вперед"
-#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
-msgid "do not remove, show only"
-msgstr "не Ñ\83далÑ\8fÑ\82Ñ\8c, Ñ\82олÑ\8cко показаÑ\82Ñ\8c Ñ\81пиÑ\81ок"
+#: builtin/pull.c:184
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "авÑ\82омаÑ\82иÑ\87еÑ\81ки вÑ\8bполнÑ\8fÑ\82Ñ\8c stash/stash pop до и поÑ\81ле пеÑ\80емеÑ\89ениÑ\8f"
-#: builtin/notes.c:946
-msgid "report pruned notes"
-msgstr "вÑ\8bвеÑ\81Ñ\82и Ñ\81пиÑ\81ок Ñ\83даленнÑ\8bÑ\85 замеÑ\82ок"
+#: builtin/pull.c:200
+msgid "Options related to fetching"
+msgstr "Ð\9eпÑ\86ии, Ñ\81вÑ\8fзаннÑ\8bе Ñ\81 извлеÑ\87ением изменений"
-#: builtin/notes.c:988
-msgid "notes-ref"
-msgstr "ссылка-на-заметку"
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
+msgstr "принудительная перезапись локальной ветки"
-#: builtin/notes.c:989
-msgid "use notes from <notes-ref>"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c замеÑ\82кÑ\83 из <Ñ\81Ñ\81Ñ\8bлка-на-замеÑ\82кÑ\83>"
+#: builtin/pull.c:218
+msgid "number of submodules pulled in parallel"
+msgstr "колиÑ\87еÑ\81Ñ\82во подмодÑ\83лей, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 полÑ\83Ñ\87енÑ\8b паÑ\80Ñ\80алелÑ\8cно"
-#: builtin/notes.c:1024
+#: builtin/pull.c:313
#, c-format
-msgid "unknown subcommand: %s"
-msgstr "неизвеÑ\81Ñ\82наÑ\8f подкоманда: %s"
+msgid "Invalid value for pull.ff: %s"
+msgstr "Ð\9dепÑ\80авилÑ\8cное знаÑ\87ение длÑ\8f pull.ff: %s"
-#: builtin/pack-objects.c:48
+#: builtin/pull.c:430
msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
-#: builtin/pack-objects.c:49
+#: builtin/pull.c:432
msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
-#: builtin/pack-objects.c:414
-#, c-format
-msgid "bad packed object CRC for %s"
-msgstr ""
+#: builtin/pull.c:433
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
-#: builtin/pack-objects.c:425
+#: builtin/pull.c:436
#, c-format
-msgid "corrupt packed object for %s"
-msgstr ""
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
-#: builtin/pack-objects.c:556
-#, c-format
-msgid "recursive delta detected for object %s"
-msgstr ""
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "Вы сейчас ни на одной из веток."
+
+#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
+
+#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
+
+#: builtin/pull.c:446 builtin/pull.c:461
+msgid "See git-pull(1) for details."
+msgstr "Для дополнительной информации, смотрите git-pull(1)."
+
+#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
+#: builtin/rebase.c:1327 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<внешний-репозиторий>"
+
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<ветка>"
+
+#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "У текущей ветки нет информации об отслеживании."
+
+#: builtin/pull.c:465 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
-#: builtin/pack-objects.c:756
+#: builtin/pull.c:470
#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
-#: builtin/pack-objects.c:769
+#: builtin/pull.c:574
#, c-format
-msgid "packfile is invalid: %s"
+msgid "unable to access commit %s"
msgstr ""
-#: builtin/pack-objects.c:773
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
+#: builtin/pull.c:854
+msgid "ignoring --verify-signatures for rebase"
+msgstr "игнорирование --verify-signatures при перемещении"
-#: builtin/pack-objects.c:777
-msgid "unable to seek in reused packfile"
-msgstr ""
+#: builtin/pull.c:909
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "--[no-]autostash можно использовать только вместе с --rebase."
-#: builtin/pack-objects.c:788
-msgid "unable to read from reused packfile"
-msgstr ""
+#: builtin/pull.c:917
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
-#: builtin/pack-objects.c:816
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "оÑ\82клÑ\8eÑ\87ение запиÑ\81и биÑ\82овÑ\8bÑ\85 каÑ\80Ñ\82, Ñ\82ак как каÑ\80Ñ\82Ñ\8b бÑ\8bли Ñ\80азбиÑ\82Ñ\8b на Ñ\87аÑ\81Ñ\82и из-за pack.packSizeLimit"
+#: builtin/pull.c:921
+msgid "pull with rebase"
+msgstr "полÑ\83Ñ\87ение Ñ\81 пеÑ\80емеÑ\89ением"
-#: builtin/pack-objects.c:829
-msgid "Writing objects"
-msgstr "Запись объектов"
+#: builtin/pull.c:922
+msgid "please commit or stash them."
+msgstr "сделайте коммит или спрячьте их."
-#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#: builtin/pull.c:947
#, c-format
-msgid "failed to stat %s"
-msgstr "не удалось выполнить stat %s"
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
-#: builtin/pack-objects.c:944
+#: builtin/pull.c:953
#, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr ""
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
-#: builtin/pack-objects.c:1112
-msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "оÑ\82клÑ\8eÑ\87ение запиÑ\81и биÑ\82овÑ\8bÑ\85 каÑ\80Ñ\82, Ñ\82ак как некоÑ\82оÑ\80Ñ\8bе обÑ\8aекÑ\82Ñ\8b не бÑ\8bли Ñ\83пакованÑ\8b"
+#: builtin/pull.c:968
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Ð\9dелÑ\8cзÑ\8f Ñ\81лиÑ\82Ñ\8c неÑ\81колÑ\8cко веÑ\82ок в пÑ\83Ñ\81Ñ\82ой Ñ\83казаÑ\82елÑ\8c на веÑ\82кÑ\83."
-#: builtin/pack-objects.c:1489
-#, c-format
-msgid "delta base offset overflow in pack for %s"
-msgstr ""
+#: builtin/pull.c:972
+msgid "Cannot rebase onto multiple branches."
+msgstr "Невозможно переместить над несколькими ветками."
-#: builtin/pack-objects.c:1498
-#, c-format
-msgid "delta base offset out of bound for %s"
-msgstr ""
+#: builtin/pull.c:979
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
-#: builtin/pack-objects.c:1771
-msgid "Counting objects"
-msgstr "Подсчет объектов"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/pack-objects.c:1913
-#, c-format
-msgid "unable to get size of %s"
-msgstr "не удалось получить размер %s"
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "указано сокращение tag, но не указана сама <метка>"
-#: builtin/pack-objects.c:1928
-#, c-format
-msgid "unable to parse object header of %s"
-msgstr "не удалось разобрать заголовок объекта %s"
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr "опция --delete принимает только простые целевые имена ссылок"
-#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
-#: builtin/pack-objects.c:2021
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
+
+#: builtin/push.c:170
#, c-format
-msgid "object %s cannot be read"
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
msgstr ""
-#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#: builtin/push.c:185
#, c-format
-msgid "object %s inconsistent object length (%lu vs %lu)"
-msgstr ""
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n"
-#: builtin/pack-objects.c:2035
-msgid "suboptimal pack - out of memory"
-msgstr ""
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n"
-#: builtin/pack-objects.c:2369
+#: builtin/push.c:207
#, c-format
-msgid "Delta compression using up to %d threads"
-msgstr "При сжатии изменений используется до %d потоков"
+msgid ""
+"The current branch %s has multiple upstream branches, refusing to push."
+msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
-#: builtin/pack-objects.c:2505
+#: builtin/push.c:210
#, c-format
-msgid "unable to pack objects reachable from tag %s"
-msgstr ""
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
-#: builtin/pack-objects.c:2589
-msgid "Compressing objects"
-msgstr "СжаÑ\82ие обÑ\8aекÑ\82ов"
+#: builtin/push.c:269
+msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "Ð\92Ñ\8b не Ñ\83казали Ñ\81пеÑ\86иÑ\84икаÑ\86иÑ\8e Ñ\81Ñ\81Ñ\8bлки длÑ\8f оÑ\82пÑ\80авки, а push.default Ñ\83казан как «nothing»."
-#: builtin/pack-objects.c:2595
-msgid "inconsistency with delta count"
-msgstr ""
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/pack-objects.c:2674
-#, c-format
+#: builtin/push.c:282
msgid ""
-"expected edge object ID, got garbage:\n"
-" %s"
-msgstr ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/pack-objects.c:2680
-#, c-format
+#: builtin/push.c:288
msgid ""
-"expected object ID, got garbage:\n"
-" %s"
-msgstr ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/pack-objects.c:2760
-msgid "invalid value for --missing"
-msgstr "недопÑ\83Ñ\81Ñ\82имое знаÑ\87ение длÑ\8f --missing"
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "Ð\9eбновлениÑ\8f бÑ\8bли оÑ\82клоненÑ\8b, Ñ\82ак как меÑ\82ка Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82 во внеÑ\88нем Ñ\80епозиÑ\82оÑ\80ии."
-#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
-msgid "cannot open pack index"
-msgstr ""
+#: builtin/push.c:298
+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/pack-objects.c:2850
+#: builtin/push.c:359
#, c-format
-msgid "loose object at %s could not be examined"
-msgstr ""
-
-#: builtin/pack-objects.c:2935
-msgid "unable to force loose object"
-msgstr ""
+msgid "Pushing to %s\n"
+msgstr "Отправка в %s\n"
-#: builtin/pack-objects.c:3022
+#: builtin/push.c:364
#, c-format
-msgid "not a rev '%s'"
-msgstr ""
+msgid "failed to push some refs to '%s'"
+msgstr "не удалось отправить некоторые ссылки в «%s»"
-#: builtin/pack-objects.c:3025
+#: builtin/push.c:398
#, c-format
-msgid "bad revision '%s'"
-msgstr ""
+msgid "bad repository '%s'"
+msgstr "плохой репозитория «%s»"
-#: builtin/pack-objects.c:3045
-msgid "unable to add recent objects"
-msgstr ""
+#: builtin/push.c:399
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n"
-#: builtin/pack-objects.c:3095
-#, c-format
-msgid "unsupported index version %s"
-msgstr "неподдерживаемая версия индекса %s"
+#: builtin/push.c:554
+msgid "repository"
+msgstr "репозиторий"
-#: builtin/pack-objects.c:3099
-#, c-format
-msgid "bad index version '%s'"
-msgstr "плохая версия индекса «%s»"
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr "отправить все ссылки"
-#: builtin/pack-objects.c:3130
-msgid "do not show progress meter"
-msgstr "не выводить прогресс выполнения"
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr "сделать зеркало всех ссылок"
-#: builtin/pack-objects.c:3132
-msgid "show progress meter"
-msgstr "показать прогресс выполнения"
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr "удалить ссылки"
-#: builtin/pack-objects.c:3134
-msgid "show progress meter during object writing phase"
-msgstr "показаÑ\82Ñ\8c пÑ\80огÑ\80еÑ\81Ñ\81 вÑ\8bполнениÑ\8f во вÑ\80емÑ\8f запиÑ\81и обÑ\8aекÑ\82ов"
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "оÑ\82пÑ\80авиÑ\82Ñ\8c меÑ\82ки (нелÑ\8cзÑ\8f иÑ\81полÑ\8cзоваÑ\82Ñ\8c вмеÑ\81Ñ\82е Ñ\81 --all или --mirror)"
-#: builtin/pack-objects.c:3137
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "похоже на --all-progress при включенном прогрессе выполнения"
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr "принудительное обновление"
-#: builtin/pack-objects.c:3138
-msgid "<version>[,<offset>]"
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/pack-objects.c:3139
-msgid "write the pack index file in the specified idx format version"
-msgstr "записать файл индекса пакета в указанной версии формата"
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
-#: builtin/pack-objects.c:3142
-msgid "maximum size of each output pack file"
-msgstr "максимальный размер каждого выходного файла пакета"
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr "управление рекурсивной отправкой подмодулей"
+
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr "использовать тонкие пакеты"
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr "путь к программе упаковки на сервере"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "установить вышестоящую ветку для git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "почистить локально удаленные ссылки"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "пропустить перехватчик pre-push"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "отправить пропущенные, но нужные метки"
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr "подписать отправку с помощью GPG"
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr "запросить выполнение атомарной транзакции на внешней стороне"
-#: builtin/pack-objects.c:3144
-msgid "ignore borrowed objects from alternate object store"
-msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete несовместимо с --all, --mirror и --tags"
-#: builtin/pack-objects.c:3146
-msgid "ignore packed objects"
-msgstr "игнорировать упакованные объекты"
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete не имеет смысла без указания ссылок"
-#: builtin/pack-objects.c:3148
-msgid "limit pack window by objects"
-msgstr "ограничить окно пакета по количеству объектов"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr "--all и --tags нельзя использовать одновременно"
-#: builtin/pack-objects.c:3150
-msgid "limit pack window by memory in addition to object limit"
-msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/pack-objects.c:3152
-msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror и --tags нельзя использовать одновременно"
-#: builtin/pack-objects.c:3154
-msgid "reuse existing deltas"
-msgstr "использовать повторно существующие дельты"
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/pack-objects.c:3156
-msgid "reuse existing objects"
-msgstr "использовать повторно существующие объекты"
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr "--all и --mirror нельзя использовать одновременно"
-#: builtin/pack-objects.c:3158
-msgid "use OFS_DELTA objects"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b OFS_DELTA"
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr "опÑ\86ии длÑ\8f оÑ\82пÑ\80авки не должнÑ\8b Ñ\81одеÑ\80жаÑ\82Ñ\8c Ñ\81имволÑ\8b пеÑ\80евода Ñ\81Ñ\82Ñ\80ок"
-#: builtin/pack-objects.c:3160
-msgid "use threads when searching for best delta matches"
-msgstr "использовать многопоточность при поиске лучших совпадений дельт"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
-#: builtin/pack-objects.c:3162
-msgid "do not create an empty pack output"
-msgstr "не создавать пустые выходные пакеты"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
-#: builtin/pack-objects.c:3164
-msgid "read revision arguments from standard input"
-msgstr "прочитать аргументы редакций из стандартного ввода"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
-#: builtin/pack-objects.c:3166
-msgid "limit the objects to those that are not yet packed"
-msgstr "ограничиться объектами, которые еще не упакованы"
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
-#: builtin/pack-objects.c:3169
-msgid "include objects reachable from any reference"
-msgstr "включить объекты, которые достижимы по любой из ссылок"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
-#: builtin/pack-objects.c:3172
-msgid "include objects referred by reflog entries"
-msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
-#: builtin/pack-objects.c:3175
-msgid "include objects referred to by the index"
-msgstr "включить объекты, на которые ссылается индекс"
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
+msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "output pack to stdout"
-msgstr "вывести пакет на стандартный вывод"
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
+msgstr ""
-#: builtin/pack-objects.c:3180
-msgid "include tag objects that refer to objects to be packed"
-msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
+"[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])"
-#: builtin/pack-objects.c:3182
-msgid "keep unreachable objects"
-msgstr "сохранять ссылки на недоступные объекты"
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "записать результирующий индекс в <файл>"
-#: builtin/pack-objects.c:3184
-msgid "pack loose unreachable objects"
-msgstr "паковать недостижимые объекты"
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "просто очистить индекс"
-#: builtin/pack-objects.c:3186
-msgid "unpack unreachable objects newer than <time>"
-msgstr "распаковать недоступные объекты, которые новее, чем <время>"
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "Слияние"
-#: builtin/pack-objects.c:3189
-msgid "create thin packs"
-msgstr "создавать тонкие пакеты"
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "выполнить слияние в дополнение к чтению"
-#: builtin/pack-objects.c:3191
-msgid "create packs suitable for shallow fetches"
-msgstr "Ñ\81оздаваÑ\82Ñ\8c пакеÑ\82Ñ\8b, подÑ\85одÑ\8fÑ\89ие длÑ\8f Ñ\87аÑ\81Ñ\82иÑ\87нÑ\8bÑ\85 извлеÑ\87ений"
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "Ñ\82Ñ\80еÑ\85Ñ\85одовое Ñ\81лиÑ\8fние, еÑ\81ли не Ñ\82Ñ\80ебÑ\83еÑ\82Ñ\81Ñ\8f Ñ\81лиÑ\8fние на Ñ\83Ñ\80овне Ñ\84айлов"
-#: builtin/pack-objects.c:3193
-msgid "ignore packs that have companion .keep file"
-msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов"
-#: builtin/pack-objects.c:3195
-msgid "ignore this pack"
-msgstr "игнорировать этот пакет"
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "тоже, что и -m, но отменяет изменения не слитых записей"
-#: builtin/pack-objects.c:3197
-msgid "pack compression level"
-msgstr "уровень сжатия пакета"
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<подкаталог>/"
-#: builtin/pack-objects.c:3199
-msgid "do not hide commits by grafts"
-msgstr "не Ñ\81кÑ\80Ñ\8bваÑ\82Ñ\8c коммиÑ\82Ñ\8b Ñ\81Ñ\80аÑ\89ениÑ\8fми"
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "пÑ\80оÑ\87иÑ\82аÑ\82Ñ\8c деÑ\80ево в индекÑ\81 в <подкаÑ\82алог>/"
-#: builtin/pack-objects.c:3201
-msgid "use a bitmap index if available to speed up counting objects"
-msgstr "по возможноÑ\81Ñ\82и иÑ\81полÑ\8cзоваÑ\82Ñ\8c индекÑ\81 в биÑ\82овÑ\8bÑ\85 каÑ\80Ñ\82аÑ\85, длÑ\8f Ñ\83Ñ\81коÑ\80ениÑ\8f подÑ\81Ñ\87еÑ\82а обÑ\8aекÑ\82ов"
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "обновиÑ\82Ñ\8c Ñ\80абоÑ\87ий каÑ\82алог Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82ом Ñ\81лиÑ\8fниÑ\8f"
-#: builtin/pack-objects.c:3203
-msgid "write a bitmap index together with the pack index"
-msgstr "запись индекса в битовых картах вместе с индексом пакета"
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
-#: builtin/pack-objects.c:3206
-msgid "handling for missing objects"
-msgstr "обработка отсутствующих объектов"
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "разрешить перезапись явно игнорируемых файлов"
-#: builtin/pack-objects.c:3209
-msgid "do not pack objects in promisor packfiles"
-msgstr "не упаковывать объекты в promisor файлы пакетов"
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "не проверять рабочий каталог после слияния"
-#: builtin/pack-objects.c:3233
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
-msgstr "глубина цепочки различий %d слишком большая, использую принудительно %d"
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "не обновлять индекс или рабочий каталог"
-#: builtin/pack-objects.c:3238
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d"
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "пропустить применение фильтра частичного переключения на состояние"
-#: builtin/pack-objects.c:3294
-msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr ""
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "отладка unpack-trees"
-#: builtin/pack-objects.c:3296
-msgid "minimum pack size limit is 1 MiB"
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
msgstr ""
-#: builtin/pack-objects.c:3301
-msgid "--thin cannot be used to build an indexable pack"
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3304
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3310
-msgid "cannot use --filter without --stdout"
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/pack-objects.c:3366
-msgid "Enumerating objects"
-msgstr "Перечисление объектов"
-
-#: builtin/pack-objects.c:3385
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
#, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Всего %<PRIu32> (изменения %<PRIu32>), повторно использовано %<PRIu32> (изменения %<PRIu32>)"
-
-#: builtin/pack-refs.c:7
-msgid "git pack-refs [<options>]"
-msgstr "git pack-refs [<опции>]"
-
-#: builtin/pack-refs.c:15
-msgid "pack everything"
-msgstr "паковать всё"
-
-#: builtin/pack-refs.c:16
-msgid "prune loose refs (default)"
-msgstr "почистить слабые ссылки (по умолчанию)"
-
-#: builtin/prune-packed.c:9
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgid "unusable todo list: '%s'"
+msgstr "непригодный для использования список дел: «%s»"
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Удаление дублирующихся объектов"
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
-#: builtin/prune.c:12
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<ветка>…]"
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr ""
-#: builtin/prune.c:109
-msgid "report pruned objects"
-msgstr "вывести список удаленных объектов"
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
-#: builtin/prune.c:112
-msgid "expire objects older than <time>"
-msgstr "удалить объекты старее чем <дата-окончания>"
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr ""
-#: builtin/prune.c:114
-msgid "limit traversal to objects outside promisor packfiles"
-msgstr "ограничить обход объектами вне promisor файлов пакетов"
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr ""
-#: builtin/prune.c:128
-msgid "cannot prune in a precious-objects repo"
-msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
-#: builtin/pull.c:59 builtin/pull.c:61
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "Неправильное значение %s: %s"
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr ""
-#: builtin/pull.c:81
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr "оставить пустые коммиты"
-#: builtin/pull.c:132
-msgid "control for recursive fetching of submodules"
-msgstr "Ñ\83пÑ\80авление Ñ\80екÑ\83Ñ\80Ñ\81ивнÑ\8bм извлеÑ\87ением подмодÑ\83лей"
+#: builtin/rebase.c:451 builtin/revert.c:127
+msgid "allow commits with empty messages"
+msgstr "Ñ\80азÑ\80еÑ\88иÑ\82Ñ\8c коммиÑ\82Ñ\8b Ñ\81 пÑ\83Ñ\81Ñ\82Ñ\8bми Ñ\81ообÑ\89ениÑ\8fми"
-#: builtin/pull.c:136
-msgid "Options related to merging"
-msgstr "Опции, связанные со слиянием"
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr ""
-#: builtin/pull.c:139
-msgid "incorporate changes by rebasing rather than merging"
-msgstr "забрать изменения с помощью перемещения, а не слияния"
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
-msgid "allow fast-forward"
-msgstr "разрешить перемотку вперед"
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
-#: builtin/pull.c:175
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "автоматически выполнять stash/stash pop до и после перемещения"
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr ""
-#: builtin/pull.c:191
-msgid "Options related to fetching"
-msgstr "Опции, связанные с извлечением изменений"
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
+msgstr ""
-#: builtin/pull.c:209
-msgid "number of submodules pulled in parallel"
-msgstr "колиÑ\87еÑ\81Ñ\82во подмодÑ\83лей, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 полÑ\83Ñ\87енÑ\8b паÑ\80Ñ\80алелÑ\8cно"
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr "пÑ\80одолжиÑ\82Ñ\8c пеÑ\80емеÑ\89ение"
-#: builtin/pull.c:304
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "Неправильное значение для pull.ff: %s"
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr ""
-#: builtin/pull.c:420
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
-msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr ""
-#: builtin/pull.c:422
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
-msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr ""
-#: builtin/pull.c:423
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
-msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr "вывести короткие идентификаторы коммитов в списке действий"
-#: builtin/pull.c:426
-#, c-format
-msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
-msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr "вывести полные идентификаторы коммитов в списке действий"
-#: builtin/pull.c:431 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
-msgstr "Ð\92Ñ\8b Ñ\81ейÑ\87аÑ\81 ни на одной из веÑ\82ок."
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr "пÑ\80овеÑ\80иÑ\82Ñ\8c Ñ\81пиÑ\81ок дел"
-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
-msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е на какÑ\83Ñ\8e веÑ\82кÑ\83 вÑ\8b Ñ\85оÑ\82иÑ\82е пеÑ\80емеÑ\81Ñ\82иÑ\82Ñ\8c изменениÑ\8f."
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr "пеÑ\80еÑ\81Ñ\82авиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80оки fixup/squash"
-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
-msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е Ñ\81 какой веÑ\82кой вÑ\8b Ñ\85оÑ\82иÑ\82е Ñ\81лиÑ\82Ñ\8c изменениÑ\8f."
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr "вÑ\81Ñ\82авиÑ\82Ñ\8c командÑ\8b иÑ\81полнениÑ\8f коммиÑ\82ов в Ñ\81пиÑ\81ке дейÑ\81Ñ\82вий"
-#: builtin/pull.c:436 builtin/pull.c:451
-msgid "See git-pull(1) for details."
-msgstr "Для дополнительной информации, смотрите git-pull(1)."
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
-msgid "<remote>"
-msgstr "<внешний-репозиторий>"
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
-#: git-parse-remote.sh:65
-msgid "<branch>"
-msgstr "<ветка>"
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr ""
-#: builtin/pull.c:446 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
-msgstr "У текущей ветки нет информации об отслеживании."
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
-#: builtin/pull.c:455 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
-msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
-#: builtin/pull.c:460
-#, 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/rebase.c:486
+msgid "the upstream commit"
+msgstr ""
-#: builtin/pull.c:829
-msgid "ignoring --verify-signatures for rebase"
-msgstr "игнорирование --verify-signatures при перемещении"
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr ""
-#: builtin/pull.c:877
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash можно использовать только вместе с --rebase."
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr ""
-#: builtin/pull.c:885
-msgid "Updating an unborn branch with changes added to the index."
-msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr ""
-#: builtin/pull.c:888
-msgid "pull with rebase"
-msgstr "получение с перемещением"
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr ""
-#: builtin/pull.c:889
-msgid "please commit or stash them."
-msgstr "сделайте коммит или спрячьте их."
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr ""
-#: builtin/pull.c:914
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
-msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
-#: builtin/pull.c:919
-#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
-msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
-#: builtin/pull.c:934
-msgid "Cannot merge multiple branches into empty head."
-msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr ""
-#: builtin/pull.c:938
-msgid "Cannot rebase onto multiple branches."
-msgstr "Невозможно переместить над несколькими ветками."
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr ""
-#: builtin/pull.c:945
-msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr ""
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr ""
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
-msgstr "указано сокращение tag, но не указана сама <метка>"
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
-#: builtin/push.c:121
-msgid "--delete only accepts plain target ref names"
-msgstr "опция --delete принимает только простые целевые имена ссылок"
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges"
-#: builtin/push.c:165
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
+#: builtin/rebase.c:534 builtin/rebase.c:1787
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
-#: builtin/push.c:168
+#: builtin/rebase.c:586
#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
-msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s"
+msgid "could not get 'onto': '%s'"
+msgstr ""
-#: builtin/push.c:183
+#: builtin/rebase.c:601
#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
-msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n"
+msgid "invalid orig-head: '%s'"
+msgstr ""
-#: builtin/push.c:197
+#: builtin/rebase.c:626
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
-msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n"
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
-#: builtin/push.c:205
+#: builtin/rebase.c:702
#, c-format
-msgid ""
-"The current branch %s has multiple upstream branches, refusing to push."
-msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
+msgid "Could not read '%s'"
+msgstr ""
-#: builtin/push.c:208
+#: builtin/rebase.c:720
#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
-msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
+msgid "Cannot store %s"
+msgstr ""
-#: builtin/push.c:267
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»."
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
+msgstr ""
-#: builtin/push.c:274
+#: builtin/rebase.c:940
msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Ð\9eбновлениÑ\8f бÑ\8bли оÑ\82клоненÑ\8b, Ñ\82ак как веÑ\80Ñ\85Ñ\83Ñ\88ка ваÑ\88ей Ñ\82екÑ\83Ñ\89ей веÑ\82ки\nпозади ее внеÑ\88ней Ñ\87аÑ\81Ñ\82и. Ð\97абеÑ\80иÑ\82е и Ñ\81лейÑ\82е внеÑ\88ние изменениÑ\8f \n(напÑ\80имеÑ\80, Ñ\81 помоÑ\89Ñ\8cÑ\8e «git pull â\80¦Â») пеÑ\80ед повÑ\82оÑ\80ной попÑ\8bÑ\82кой оÑ\82пÑ\80авки\nизменений.\nÐ\94лÑ\8f дополниÑ\82елÑ\8cной инÑ\84оÑ\80маÑ\86ии, Ñ\81моÑ\82Ñ\80иÑ\82е «Note about fast-forwards»\nв «git push --help»."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
+msgstr "РазÑ\80еÑ\88иÑ\82е вÑ\81е конÑ\84ликÑ\82Ñ\8b вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e, помеÑ\82Ñ\8cÑ\82е иÑ\85 Ñ\80азÑ\80еÑ\88Ñ\91ннÑ\8bми Ñ\81 помоÑ\89Ñ\8cÑ\8e «git add/rm <конÑ\84ликÑ\82Ñ\83Ñ\8eÑ\89ие-Ñ\84айлÑ\8b>», а заÑ\82ем запÑ\83Ñ\81Ñ\82иÑ\82е «git rebase --continue».\nÐ\95Ñ\81ли вÑ\8b Ñ\85оÑ\82иÑ\82е пÑ\80опÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 коммиÑ\82, Ñ\82о запÑ\83Ñ\81Ñ\82иÑ\82е «git rebase --skip».\nЧÑ\82обÑ\8b веÑ\80нÑ\83Ñ\82Ñ\8cÑ\81Ñ\8f на Ñ\81оÑ\81Ñ\82оÑ\8fние до «git rebase», запÑ\83Ñ\81Ñ\82иÑ\82е «git rebase --abort»."
-#: builtin/push.c:280
+#: builtin/rebase.c:1021
+#, c-format
msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
-#: builtin/push.c:286
+#: builtin/rebase.c:1313
+#, c-format
msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
-msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-
-#: builtin/push.c:293
-msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+msgstr ""
-#: builtin/push.c:296
+#: builtin/rebase.c:1329
+#, c-format
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"
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
-#: builtin/push.c:357
-#, c-format
-msgid "Pushing to %s\n"
-msgstr "Отправка в %s\n"
+#: builtin/rebase.c:1359
+msgid "exec commands cannot contain newlines"
+msgstr ""
-#: builtin/push.c:361
-#, c-format
-msgid "failed to push some refs to '%s'"
-msgstr "не удалось отправить некоторые ссылки в «%s»"
+#: builtin/rebase.c:1363
+msgid "empty exec command"
+msgstr ""
-#: builtin/push.c:395
-#, c-format
-msgid "bad repository '%s'"
-msgstr "плохой репозитория «%s»"
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
-#: builtin/push.c:396
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n"
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
+msgstr ""
-#: builtin/push.c:551
-msgid "repository"
-msgstr "репозиторий"
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
+msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:164
-msgid "push all refs"
-msgstr "отправить все ссылки"
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:166
-msgid "mirror all refs"
-msgstr "сделать зеркало всех ссылок"
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
-#: builtin/push.c:555
-msgid "delete refs"
-msgstr "удалить ссылки"
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
+msgstr ""
-#: builtin/push.c:556
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
+msgstr ""
-#: builtin/push.c:559 builtin/send-pack.c:167
-msgid "force updates"
-msgstr "принудительное обновление"
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:181
-msgid "<refname>:<expect>"
+#: builtin/rebase.c:1422
+msgid "continue"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
-msgid "require old value of ref to be at this value"
-msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr ""
-#: builtin/push.c:565
-msgid "control recursive pushing of submodules"
-msgstr "управление рекурсивной отправкой подмодулей"
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
+msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:175
-msgid "use thin pack"
-msgstr "использовать тонкие пакеты"
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
+msgstr ""
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
-msgid "receive pack program"
-msgstr "путь к программе упаковки на сервере"
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
-#: builtin/push.c:570
-msgid "set upstream for git pull/status"
-msgstr "установить вышестоящую ветку для git pull/status"
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
+msgstr ""
-#: builtin/push.c:573
-msgid "prune locally removed refs"
-msgstr "почистить локально удаленные ссылки"
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
+msgstr ""
-#: builtin/push.c:575
-msgid "bypass pre-push hook"
-msgstr "пропустить перехватчик pre-push"
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
-#: builtin/push.c:576
-msgid "push missing but relevant tags"
-msgstr "отправить пропущенные, но нужные метки"
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
-#: builtin/push.c:579 builtin/send-pack.c:169
-msgid "GPG sign the push"
-msgstr "подписать отправку с помощью GPG"
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
+msgstr ""
-#: builtin/push.c:581 builtin/send-pack.c:176
-msgid "request atomic transaction on remote side"
-msgstr "запросить выполнение атомарной транзакции на внешней стороне"
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
-#: builtin/push.c:599
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete несовместимо с --all, --mirror и --tags"
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
+msgstr ""
-#: builtin/push.c:601
-msgid "--delete doesn't make sense without any refs"
-msgstr "--delete не имеет смысла без указания ссылок"
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
-#: builtin/push.c:604
-msgid "--all and --tags are incompatible"
-msgstr "--all и --tags нельзя использовать одновременно"
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
+msgstr ""
-#: builtin/push.c:606
-msgid "--all can't be combined with refspecs"
-msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
-#: builtin/push.c:610
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror и --tags нельзя использовать одновременно"
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
-#: builtin/push.c:612
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
+msgstr ""
-#: builtin/push.c:615
-msgid "--all and --mirror are incompatible"
-msgstr "--all и --mirror нельзя использовать одновременно"
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
+msgstr "опция"
-#: builtin/push.c:634
-msgid "push options must not have new line characters"
-msgstr "опции для отправки не должны содержать символы перевода строк"
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
+msgstr ""
-#: builtin/range-diff.c:8
-msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/range-diff.c:9
-msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/range-diff.c:10
-msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
+
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/range-diff.c:26
-msgid "Percentage by which creation is weighted"
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
+msgstr "Нет перемещения в процессе?"
+
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
+
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
+msgstr "Не удалось прочитать HEAD"
+
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
+
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
msgstr ""
-#: builtin/range-diff.c:28
-msgid "color both diff and diff-between-diffs"
+#: builtin/rebase.c:1626
+#, c-format
+msgid "could not move back to %s"
msgstr ""
-#: builtin/range-diff.c:75 builtin/range-diff.c:79
+#: builtin/rebase.c:1637 builtin/rm.c:369
#, c-format
-msgid "no .. in range: '%s'"
+msgid "could not remove '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: builtin/rebase.c:1663
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there.\n"
msgstr ""
-#: builtin/range-diff.c:89
-msgid "single arg format must be symmetric range"
+#: builtin/rebase.c:1684
+msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/range-diff.c:104
-msgid "need two commit ranges"
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
msgstr ""
-#: 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>]])"
-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/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
-#: builtin/read-tree.c:120
-msgid "write resulting index to <file>"
-msgstr "записать результирующий индекс в <файл>"
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
-#: builtin/read-tree.c:123
-msgid "only empty the index"
-msgstr "просто очистить индекс"
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
-#: builtin/read-tree.c:125
-msgid "Merging"
-msgstr "Слияние"
+#: builtin/rebase.c:1819
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
-#: builtin/read-tree.c:127
-msgid "perform a merge in addition to a read"
-msgstr "выполнить слияние в дополнение к чтению"
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
-#: builtin/read-tree.c:129
-msgid "3-way merge if no file level merging required"
-msgstr "трехходовое слияние, если не требуется слияние на уровне файлов"
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
-#: builtin/read-tree.c:131
-msgid "3-way merge in presence of adds and removes"
-msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов"
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
-#: builtin/read-tree.c:133
-msgid "same as -m, but discard unmerged entries"
-msgstr "тоже, что и -m, но отменяет изменения не слитых записей"
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
+msgstr ""
-#: builtin/read-tree.c:134
-msgid "<subdirectory>/"
-msgstr "<подкаталог>/"
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
-#: builtin/read-tree.c:135
-msgid "read the tree into the index under <subdirectory>/"
-msgstr "прочитать дерево в индекс в <подкаталог>/"
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
-#: builtin/read-tree.c:138
-msgid "update working tree with merge result"
-msgstr "обновить рабочий каталог результатом слияния"
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
-#: builtin/read-tree.c:140
-msgid "gitignore"
-msgstr "gitignore"
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
+msgstr "Нет такой ссылки: %s"
-#: builtin/read-tree.c:141
-msgid "allow explicitly ignored files to be overwritten"
-msgstr "разрешить перезапись явно игнорируемых файлов"
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
-#: builtin/read-tree.c:144
-msgid "don't check the working tree after merging"
-msgstr "не пÑ\80овеÑ\80Ñ\8fÑ\82Ñ\8c Ñ\80абоÑ\87ий каÑ\82алог поÑ\81ле Ñ\81лиÑ\8fния"
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c авÑ\82омаÑ\82иÑ\87еÑ\81ки Ñ\81пÑ\80Ñ\8fÑ\82аÑ\82Ñ\8c изменения"
-#: builtin/read-tree.c:145
-msgid "don't update the index or the work tree"
-msgstr "не обновлять индекс или рабочий каталог"
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
-#: builtin/read-tree.c:147
-msgid "skip applying sparse checkout filter"
-msgstr "пропустить применение фильтра частичного переключения на состояние"
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
-#: builtin/read-tree.c:149
-msgid "debug unpack-trees"
-msgstr "отладка unpack-trees"
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
-msgstr "git rebase--helper [<опции>]"
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
+msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
-msgstr "оставить пустые коммиты"
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD сейчас на %s"
-#: builtin/rebase--helper.c:26 builtin/revert.c:124
-msgid "allow commits with empty messages"
-msgstr "разрешить коммиты с пустыми сообщениями"
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
+msgstr "Сделайте коммит или спрячьте их."
-#: builtin/rebase--helper.c:27
-msgid "rebase merge commits"
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "keep original branch points of cousins"
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase--helper.c:30
-msgid "continue rebase"
-msgstr "продолжить перемещение"
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
+msgstr "HEAD уже в актуальном состоянии."
-#: builtin/rebase--helper.c:32
-msgid "abort rebase"
-msgstr "остановить перемещение"
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
-msgstr "создать сценарий перемещения"
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
-#: builtin/rebase--helper.c:37
-msgid "shorten commit ids in the todo list"
-msgstr "вывести короткие идентификаторы коммитов в списке действий"
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
-#: builtin/rebase--helper.c:39
-msgid "expand commit ids in the todo list"
-msgstr "вÑ\8bвеÑ\81Ñ\82и полнÑ\8bе иденÑ\82иÑ\84икаÑ\82оÑ\80Ñ\8b коммиÑ\82ов в Ñ\81пиÑ\81ке дейÑ\81Ñ\82вий"
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Ð\9fеÑ\80еÑ\85ваÑ\82Ñ\87ик pre-rebase оÑ\82казал в пеÑ\80емеÑ\89ении."
-#: builtin/rebase--helper.c:41
-msgid "check the todo list"
-msgstr "проверить список дел"
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
-msgstr "пропустить ненужные команды pick"
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
-#: builtin/rebase--helper.c:45
-msgid "rearrange fixup/squash lines"
-msgstr "переставить строки fixup/squash"
+#: builtin/rebase.c:2106
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
-#: builtin/rebase--helper.c:47
-msgid "insert exec commands in todo list"
-msgstr "вставить команды исполнения коммитов в списке действий"
+#: builtin/rebase.c:2115
+msgid "Could not detach HEAD"
+msgstr ""
-#: builtin/rebase--helper.c:68
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges"
+#: builtin/rebase.c:2124
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <каталог-git>"
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:833
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"
"'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:850
+#: builtin/receive-pack.c:853
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"
"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:1923
+#: builtin/receive-pack.c:1940
msgid "quiet"
msgstr "тихий режим"
-#: builtin/receive-pack.c:1937
+#: builtin/receive-pack.c:1954
msgid "You must specify a directory."
msgstr "Вы должны указать каталог."
-#: builtin/reflog.c:536 builtin/reflog.c:541
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] "
+"[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
+" <refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» не является допустимой меткой даты/времени"
-#: builtin/remote.c:15
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:16
+#: builtin/remote.c:17
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:17 builtin/remote.c:37
+#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote rename <старое-название> <новое-название>"
-#: builtin/remote.c:18 builtin/remote.c:42
+#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr "git remote remove <имя>"
-#: builtin/remote.c:19 builtin/remote.c:47
+#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)"
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <имя>"
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <имя>"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <имя> <ветка>…"
-#: builtin/remote.c:24 builtin/remote.c:73
+#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <имя>"
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]"
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <имя> <новый-url>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <имя> <url>"
-#: builtin/remote.c:32
+#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<опции>] <имя> <url>"
-#: builtin/remote.c:52
+#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <имя> <ветка>…"
-#: builtin/remote.c:53
+#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <имя> <ветка>…"
-#: builtin/remote.c:58
+#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<опции>] <имя>"
-#: builtin/remote.c:63
+#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<опции>] <имя>"
-#: builtin/remote.c:68
+#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…"
-#: builtin/remote.c:97
+#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr "Обновление %s"
-#: builtin/remote.c:129
+#: builtin/remote.c:130
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:146
+#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr "неизвестный аргумент для mirror: %s"
-#: builtin/remote.c:162
+#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr "извлечь внешние ветки"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr "импортировать все метки и ассоциированные объекты при извлечении"
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "или не извлекать метки вообще (--no-tags)"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr "отслеживаемые ветки"
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "master branch"
msgstr "мастер ветка"
-#: builtin/remote.c:171
-msgid "push|fetch"
-msgstr "push|fetch"
-
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений"
-#: builtin/remote.c:184
+#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "указание мастер ветки не имеет смысла с параметром --mirror"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
-#: builtin/remote.c:193 builtin/remote.c:635
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже существует"
-#: builtin/remote.c:197 builtin/remote.c:639
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» не является допустимым именем внешнего репозитория."
-#: builtin/remote.c:237
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr "Не удалось настроить мастер ветку «%s»"
-#: builtin/remote.c:343
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Не удалось извлечь карту для спецификатора ссылки %s"
-#: builtin/remote.c:442 builtin/remote.c:450
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "(соответствующая)"
-#: builtin/remote.c:454
+#: builtin/remote.c:455
msgid "(delete)"
msgstr "(удаленная)"
-#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "No such remote: %s"
-msgstr "Нет такого внешнего репозитория: %s"
+msgid "No such remote: '%s'"
+msgstr ""
-#: builtin/remote.c:645
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
-#: builtin/remote.c:665
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
-#: builtin/remote.c:701
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалось удалить «%s»"
-#: builtin/remote.c:735
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "не удалось создать «%s»"
-#: builtin/remote.c:801
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-#: builtin/remote.c:815
+#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Не удалось удалить секцию файла конфигурации «%s»"
-#: builtin/remote.c:916
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
-#: builtin/remote.c:919
+#: builtin/remote.c:920
msgid " tracked"
msgstr " отслеживается"
-#: builtin/remote.c:921
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:923
+#: builtin/remote.c:924
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:964
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "перемещается интерактивно над внешней веткой %s"
-#: builtin/remote.c:975
+#: builtin/remote.c:976
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:978
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr "перемещается над внешней веткой %s"
-#: builtin/remote.c:982
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr " будет слита с внешней веткой %s"
-#: builtin/remote.c:985
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "будет слита с внешней веткой %s"
-#: builtin/remote.c:988
+#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с внешней веткой %s\n"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
msgid "create"
msgstr "создана"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1035
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr "локальная ветка устарела"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1054
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1129
+#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1157
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr " URL для извлечения: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(нет URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr " URL для отправки: %s"
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1177
msgid "(not queried)"
msgstr "(не запрашивался)"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1179
msgid "(unknown)"
msgstr "(неизвестно)"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr " (статус не запрашивался)"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локальная ветка, настроенная для «git pull»:"
msgstr[2] " Локальные ветки, настроенные для «git pull»:"
msgstr[3] " Локальные ветки, настроенные для «git pull»:"
-#: builtin/remote.c:1214
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
-#: builtin/remote.c:1220
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[2] " Локальные ссылки, настроенные для «git push»%s:"
msgstr[3] " Локальные ссылки, настроенные для «git push»%s:"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имя>/HEAD"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "Не удалось определить внешний HEAD"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
-#: builtin/remote.c:1270
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "Не удалось удалить %s"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "Недопустимая ссылка: %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "Не удалось настроить %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет висящей веткой!"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s стала висящей веткой!"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "Очистка %s"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1329
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1374
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "почистить внешние репозитории после извлечения"
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "Нет такого внешнего репозитория «%s»"
-#: builtin/remote.c:1453
+#: builtin/remote.c:1454
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1477
+#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr "запросить URL отправки, вместо URL извлечения"
-#: builtin/remote.c:1479
+#: builtin/remote.c:1480
msgid "return all URLs"
msgstr "вернуть все URL"
-#: builtin/remote.c:1507
+#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не настроены для внешнего репозитория «%s»"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1536
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1538
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1544
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add нельзя использовать одновременно с --delete"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправильный шаблон старого URL: %s"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "Не найдены совпадения URL: %s"
-#: builtin/remote.c:1593
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr "Нельзя удалить все URL не-отправки"
-#: builtin/remote.c:1609
+#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многословнее; должно стоять перед подкомандой"
-#: builtin/remote.c:1640
+#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Неизвестная подкоманда: %s"
-#: builtin/repack.c:20
+#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr "git repack [<опции>]"
-#: builtin/repack.c:25
+#: builtin/repack.c:27
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:287
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:414
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr "упаковать всё в один пакет"
-#: builtin/repack.c:289
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
-#: builtin/repack.c:292
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr "удалите лишние пакеты и запустите git-prune-packed"
-#: builtin/repack.c:294
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "передать опцию --no-reuse-delta в git-pack-objects"
-#: builtin/repack.c:296
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "передать опцию --no-reuse-object в git-pack-objects"
-#: builtin/repack.c:298
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "не запускать git-update-server-info"
-#: builtin/repack.c:301
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "передать опцию --local в git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "запись индекса в битовых картах"
-#: builtin/repack.c:304
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "примерная-дата"
-#: builtin/repack.c:305
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
-#: builtin/repack.c:307
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr "с параметром -a, перепаковать недоступные объекты"
-#: builtin/repack.c:309
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr "размер окна, используемый для компрессии дельт"
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr "количество-байт"
-#: builtin/repack.c:311
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
-#: builtin/repack.c:313
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr "ограничение на максимальную глубину дельт"
-#: builtin/repack.c:315
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "ограничение на максимальное количество потоков"
-#: builtin/repack.c:317
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "максимальный размер каждого из файлов пакета"
-#: builtin/repack.c:319
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
-#: builtin/repack.c:321
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:331
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "нельзя удалять пакеты в precious-objects репозитории"
-#: builtin/repack.c:335
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable и -A нельзя использовать одновременно"
-#: builtin/repack.c:510 builtin/worktree.c:139
+#: builtin/repack.c:423
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:484
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+
+#: builtin/repack.c:532
#, c-format
msgid "failed to remove '%s'"
msgstr "сбой удаления «%s»"
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<формат>] [-l [<шаблон>]]"
-#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
-msgstr ""
-
-#: builtin/replace.c:86
+#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr ""
-#: builtin/replace.c:137
+#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr ""
-#: builtin/replace.c:149
+#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr ""
-#: builtin/replace.c:154
+#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr ""
-#: builtin/replace.c:174
+#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/replace.c:225
+#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr ""
-#: builtin/replace.c:238
+#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr ""
-#: builtin/replace.c:254
+#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr ""
-#: builtin/replace.c:268
+#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr ""
-#: builtin/replace.c:272
+#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr ""
-#: builtin/replace.c:281
+#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr ""
-#: builtin/replace.c:285
+#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr ""
-#: builtin/replace.c:294
+#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr ""
-#: builtin/replace.c:299
+#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
-#: builtin/replace.c:445
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr ""
-#: builtin/replace.c:322
+#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr ""
-#: builtin/replace.c:338
+#: builtin/replace.c:342
msgid "editing object file failed"
msgstr ""
-#: builtin/replace.c:347
+#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "плохая метка слияния в коммите «%s»"
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "повреждённая метка слияния в коммите «%s»"
-#: builtin/replace.c:421
+#: builtin/replace.c:428
#, 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:460
+#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "подпись будет удалена в замененном коммите!"
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "не удалось записать замену для коммита: «%s»"
-#: builtin/replace.c:479
+#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:482
+#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:514
+#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:535
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr "вывести список заменяемых ссылок"
-#: builtin/replace.c:536
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "удаление заменяемых ссылок"
-#: builtin/replace.c:537
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr "изменение существующего объекта"
-#: builtin/replace.c:538
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "изменение родителя коммита"
-#: builtin/replace.c:539
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:540
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "замена ссылки, если она существует"
-#: builtin/replace.c:542
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "не делать структурированный вывод содержимого для --edit"
-#: builtin/replace.c:543
+#: builtin/replace.c:554
msgid "use this format"
msgstr "использовать этот формат"
-#: builtin/replace.c:556
+#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:564
+#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:568
+#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:574
+#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:580
+#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:586
+#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:592
+#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:598
+#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:604
+#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr ""
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]"
-#: builtin/rerere.c:59
+#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "записать чистые разрешения конфликтов в индекс"
-#: builtin/reset.c:29
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
-#: builtin/reset.c:30
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…"
-#: builtin/reset.c:31
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "mixed"
msgstr "смешанный"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "soft"
msgstr "мягкий"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "hard"
msgstr "жесткий"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "merge"
msgstr "слиянием"
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "keep"
msgstr "оставлением"
-#: builtin/reset.c:78
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "У вас нет верного HEAD."
-#: builtin/reset.c:80
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "Не удалось найти дерево у HEAD."
-#: builtin/reset.c:86
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "Не удалось найти дерево у %s."
-#: builtin/reset.c:111
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD сейчас на %s"
-
-#: builtin/reset.c:189
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния."
-#: builtin/reset.c:289
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "тихий режим, выводить только ошибки"
-#: builtin/reset.c:291
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "сбросить HEAD и индекс"
-#: builtin/reset.c:292
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "сбросить только HEAD"
-#: builtin/reset.c:294 builtin/reset.c:296
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "сбросить HEAD, индекс и рабочий каталог"
-#: builtin/reset.c:298
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "сбросить HEAD, но оставить локальные изменения"
-#: builtin/reset.c:304
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "записать только факт того, что удаленные пути будут добавлены позже"
-#: builtin/reset.c:321
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Не удалось распознать «%s» как действительную редакцию."
-#: builtin/reset.c:329
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Не удалось распознать «%s» как действительное дерево."
-#: builtin/reset.c:338
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}"
-#: builtin/reset.c:347
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead."
-#: builtin/reset.c:349
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути."
-#: builtin/reset.c:359
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "сброс «%s» разрешен только с голым репозиторием"
-#: builtin/reset.c:363
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N можно использовать вместе с --mixed"
-#: builtin/reset.c:380
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "Непроиндексированные изменения после сброса:"
-#: builtin/reset.c:386
+#: builtin/reset.c:398
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Не удалось сбросить файл индекса на редакцию «%s»."
-#: builtin/reset.c:390
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "Не удалось записать новый файл индекса."
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:405
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:457
+#: builtin/rev-list.c:466
msgid "object filtering requires --objects"
msgstr "фильтрация объектов требует указания параметра --objects"
-#: builtin/rev-list.c:460
+#: builtin/rev-list.c:469
#, c-format
msgid "invalid sparse value '%s'"
msgstr "недопустимое частичное значение «%s»"
-#: builtin/rev-list.c:501
+#: builtin/rev-list.c:510
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-list.c:504
+#: builtin/rev-list.c:513
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "нельзя использовать --use-bitmap-index одновременно с фильтрацией объектов"
-#: builtin/rev-parse.c:406
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
-#: builtin/rev-parse.c:411
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "передавать далее «--» как аргумент"
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "остановить разбор после первого аргумента не являющегося опцией"
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "выводить аргументы в длинном формате"
-#: builtin/rev-parse.c:549
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <подкоманда>"
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s нельзя использовать одновременно с %s"
-#: builtin/revert.c:100
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "конец последовательности копирования или обращения изменений коммитов"
-#: builtin/revert.c:101
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "продолжить последовательность копирования или обращения изменений коммитов"
-#: builtin/revert.c:102
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "отмена последовательности копирования или обращения изменений коммитов"
-#: builtin/revert.c:103
+#: builtin/revert.c:106
msgid "don't automatically commit"
msgstr "не коммитить автоматически"
-#: builtin/revert.c:104
+#: builtin/revert.c:107
msgid "edit the commit message"
msgstr "изменить сообщение коммита"
-#: builtin/revert.c:107
+#: builtin/revert.c:110
msgid "parent-number"
msgstr "номер-родителя"
-#: builtin/revert.c:108
+#: builtin/revert.c:111
msgid "select mainline parent"
msgstr "выбор основного родителя"
-#: builtin/revert.c:110
+#: builtin/revert.c:113
msgid "merge strategy"
msgstr "стратегия слияния"
-#: builtin/revert.c:111
-msgid "option"
-msgstr "опция"
-
-#: builtin/revert.c:112
+#: builtin/revert.c:115
msgid "option for merge strategy"
msgstr "опция для стратегии слияния"
-#: builtin/revert.c:121
+#: builtin/revert.c:124
msgid "append commit name"
msgstr "добавить имя коммита"
-#: builtin/revert.c:123
+#: builtin/revert.c:126
msgid "preserve initially empty commits"
msgstr "сохранить изначально пустые коммиты"
-#: builtin/revert.c:125
+#: builtin/revert.c:128
msgid "keep redundant, empty commits"
msgstr "оставить избыточные, пустые коммиты"
-#: builtin/revert.c:219
+#: builtin/revert.c:227
msgid "revert failed"
msgstr "сбой обращения изменений коммита"
-#: builtin/revert.c:232
+#: builtin/revert.c:240
msgid "cherry-pick failed"
msgstr "сбой при копировании коммита"
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<опции>] [--] <файл>…"
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
msgstr[3] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr "\n(используйте опцию «-f» для принудительного удаления)"
-#: builtin/rm.c:215
+#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "следующие файлы содержат проиндексированные изменения в индексе:"
msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:"
msgstr[3] "следующие файлы содержат проиндексированные изменения в индексе:"
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)"
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "следующие файлы содержат локальные изменения:"
msgstr[2] "следующие файлы содержат локальные изменения:"
msgstr[3] "следующие файлы содержат локальные изменения:"
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "не выводить список удаленных файлов"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "удалить только из индекса"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "пропустить проверку актуальности"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "разрешить рекурсивное удаление"
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "выход с нулевым кодом возврата, даже если ничего не найдено"
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "не удаляю рекурсивно «%s» без указания опции -r"
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: не удалось удалить %s"
-#: builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr "не удалось удалить «%s»"
-
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
msgid "print status from remote helper"
msgstr "вывести статус от скрипта внешнего сервера"
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr "git serve [<опции>]"
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr "выход после обмена одним запросом/ответом"
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
msgid "Linewrap output"
msgstr "Перенос строк на выводе"
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
msgid "no matching refs with %s"
msgstr "нет совпадающих записей с %s"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:646
msgid "show remote-tracking and local branches"
msgstr "показать список и отслеживаемых внешних и локальных веток"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:648
msgid "show remote-tracking branches"
msgstr "показать список отслеживаемых внешних веток"
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:650
msgid "color '*!+-' corresponding to the branch"
msgstr "окрашивать «*!+-» в соответствии с веткой"
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:652
msgid "show <n> more commits after the common ancestor"
msgstr "показать <n> коммитов после общего предка"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:654
msgid "synonym to more=-1"
msgstr "синоним для more=-1"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:655
msgid "suppress naming strings"
msgstr "не выводить именованные строки"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:657
msgid "include the current branch"
msgstr "включить в вывод текущую ветку"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:659
msgid "name commits with their object names"
msgstr "именовать коммиты их именами объектов"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:661
msgid "show possible merge bases"
msgstr "вывести возможные базы слияния"
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:663
msgid "show refs unreachable from any other ref"
msgstr "вывести ссылки, недоступные из любых других ссылок"
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:665
msgid "show commits in topological order"
msgstr "вывести коммиты в топологическом порядке"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:668
msgid "show only commits not on the first branch"
msgstr "вывести только коммиты, отсутствующие в первой ветке"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:670
msgid "show merges reachable from only one tip"
msgstr "вывести слияния, достижимые только из одной из верхушек"
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:672
msgid "topologically sort, maintaining date order where possible"
msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:675
msgid "<n>[,<base>]"
msgstr "<n>[,<база>]"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:676
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:712
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-"
"base"
msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base"
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:736
msgid "no branches given, and HEAD is not valid"
msgstr "не указаны ветки и HEAD не действительный"
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:739
msgid "--reflog option needs one branch name"
msgstr "параметр --reflog требует указания имени одной ветки"
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:742
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[2] "только %d записей могут быть показаны одновременно."
msgstr[3] "только %d записи могут быть показаны одновременно."
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:746
#, c-format
msgid "no such ref %s"
msgstr "нет такой ссылки %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:832
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[2] "невозможно обработать больше %d редакций."
msgstr[3] "невозможно обработать больше %d редакции."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:836
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» не является допустимой ссылкой на коммит."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:839
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "не удалось найти коммит %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<шаблон>…]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<шаблон>]"
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "вывести только метки (можно использовать одновременно с --heads)"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "вывести только головы (можно использовать одновременно с --tags)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "более строгая проверка ссылок, требует точный путь ссылки"
-#: builtin/show-ref.c:165 builtin/show-ref.c:167
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "вывести ссылку HEAD, даже если она будет отфильтрована"
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "разыменовать метки в идентификаторы объектов"
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
-msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c <n> Ñ\86иÑ\84Ñ\80 длÑ\8f вÑ\8bвода SHA-1"
+msgstr "иÑ\81полÑ\8cзоваÑ\82Ñ\8c <n> Ñ\81имволов длÑ\8f вÑ\8bвода SHA-1 Ñ\85еÑ\88-Ñ\81Ñ\83ммÑ\8b"
-#: builtin/show-ref.c:175
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)"
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr "git stash list [<опции>]"
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<опциии>] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <имя-ветки> [<спрятанные-изменения>]"
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr "git stash clear"
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n [--] [<спецификатор-пути>…]]"
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [<сообщение>]"
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <сообщение>] [-q|--quiet] <коммит>"
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "«%s» не является коммитом со спрятанными изменениями"
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Передано слишком много редакций:%s"
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr "Не найдены спрятанные изменения."
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s не является допустимой ссылкой на коммит"
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash очистка с параметрами не реализована"
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "нельзя применить спрятанные изменения во время выполнения слияния"
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "не удалось сгенерировать список изменений %s^!."
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr "конфликты в индексе. Попробуйте без --index."
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr "не удалось сохранить дерево индекса"
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr "невозможно восстановить неотслеживаемые файлы из спрятанных файлов"
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Слияние %s и %s"
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr "Индекс не был извлечён из спрятанных изменений."
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr "попытка пересоздания индекса"
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Отброшено %s (%s)"
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Не удалось отбросить запись из спрятанных изменений"
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "«%s» не является ссылкой на спрятанные изменения"
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr "Не указано имя ветки"
+
+#: builtin/stash.c:789 builtin/stash.c:826
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Не удолось обновить %s с %s"
+
+#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+msgid "stash message"
+msgstr "описание спрятанных изменений"
+
+#: builtin/stash.c:817
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "«git stash store» требует указания одного аргумента <коммит>"
+
+#: builtin/stash.c:1039 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr "Изменения не выбраны"
+
+#: builtin/stash.c:1135 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr "У вас еще нет начального коммита"
+
+#: builtin/stash.c:1162 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr "Не удалось сохранить текущее состояние индекса"
+
+#: builtin/stash.c:1171 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr "Невозможно сохранить неотслеживаемые файлы"
+
+#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr "Не удалось сохранить текущее состояние рабочего каталога"
+
+#: builtin/stash.c:1219 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr "Не удалось записать состояние рабочего каталога"
+
+#: builtin/stash.c:1268 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
+
+#: builtin/stash.c:1284
+msgid "Did you forget to 'git add'?"
+msgstr "Возможно, вы забыли выполнить «git add»?"
+
+#: builtin/stash.c:1299 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr "Нет локальных изменений для сохранения"
+
+#: builtin/stash.c:1306 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr "Не удалось инициализировать спрятанные изменения"
+
+#: builtin/stash.c:1321 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr "Не удалось сохранить текущий статус"
+
+#: builtin/stash.c:1326
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Рабочий каталог и состояние индекса сохранены %s"
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr "Не удалось удалить изменения рабочего каталога"
+
+#: builtin/stash.c:1465 builtin/stash.c:1501
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1467 builtin/stash.c:1503
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1468 builtin/stash.c:1504
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1470 builtin/stash.c:1506
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1568
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "пропустить и удалить все строки, начинающиеся с символа комметария"
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой строкой символ комметария и пробел"
-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
-#, c-format
-msgid "No such ref: %s"
-msgstr "Нет такой ссылки: %s"
-
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Ожидалось полное имя ссылки, а получено %s"
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "не удалось обрезать один компонент url «%s»"
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
msgid "alternative anchor for relative paths"
msgstr "альтернативный символ для относительных путей"
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules"
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:546
#, c-format
msgid ""
-"run_command returned non-zero status whilerecursing in the nested submodules of %s\n"
+"run_command returned non-zero status while recursing in the nested submodules of %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:562
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] <команда>"
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
-msgstr "не удалось запросить конфигурацию «%s». Предполагаю, что этот репозиторий имеет свой собственный вышестоящий репозиторий."
+msgstr ""
-#: builtin/submodule--helper.c:655
+#: builtin/submodule--helper.c:664
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:659
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n"
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:678
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
-#: builtin/submodule--helper.c:676
+#: builtin/submodule--helper.c:685
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:698
+#: builtin/submodule--helper.c:707
msgid "Suppress output for initializing a submodule"
msgstr "Не выводить информацию о инициализации подмодуля"
-#: builtin/submodule--helper.c:703
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<путь>]"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr ""
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»"
-#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "не удалось перейти вглубь подмодуля «%s»"
-#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
msgid "Suppress submodule status output"
msgstr "Не выводить статус подмодуля"
-#: builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:875
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля"
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:876
msgid "recurse into nested submodules"
msgstr "проходить вглубь вложенных подмодулей"
-#: builtin/submodule--helper.c:872
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
-#: builtin/submodule--helper.c:896
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <путь>"
-#: builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:969
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:966
+#: builtin/submodule--helper.c:975
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1000
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1047
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1045
+#: builtin/submodule--helper.c:1054
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]"
-#: builtin/submodule--helper.c:1099
+#: builtin/submodule--helper.c:1108
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-#: builtin/submodule--helper.c:1111
+#: builtin/submodule--helper.c:1120
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1128
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1130
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1132
+#: builtin/submodule--helper.c:1141
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1157
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1177
+#: builtin/submodule--helper.c:1186
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1178
+#: builtin/submodule--helper.c:1187
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1192
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]"
-#: builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1206
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
-#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "подмодулю «%s» не удалось добавить альтернативу: %s"
-#: builtin/submodule--helper.c:1329
+#: builtin/submodule--helper.c:1340
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
-#: builtin/submodule--helper.c:1359
+#: builtin/submodule--helper.c:1370
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1362
+#: builtin/submodule--helper.c:1373
msgid "name of the new submodule"
msgstr "имя нового подмодуля"
-#: builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1376
msgid "url where to clone the submodule from"
msgstr "url откуда должен был склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1384
msgid "depth for shallow clones"
msgstr "глубина для частичного клона"
-#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
msgid "force cloning progress"
msgstr "принудительно выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1392
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1423
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:1426
+#: builtin/submodule--helper.c:1437
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "не удалось получить каталог для подмодуля «%s»"
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Подмодуль по пути «%s» не инициализирован"
-#: builtin/submodule--helper.c:1496
+#: builtin/submodule--helper.c:1574
msgid "Maybe you want to use 'update --init'?"
msgstr "Возможно, вы хотели использовать «update --init»?"
-#: builtin/submodule--helper.c:1525
+#: builtin/submodule--helper.c:1604
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Пропуск не слитого подмодуля %s"
-#: builtin/submodule--helper.c:1554
+#: builtin/submodule--helper.c:1633
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Пропуск подмодуля «%s»"
-#: builtin/submodule--helper.c:1689
+#: builtin/submodule--helper.c:1777
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
-#: builtin/submodule--helper.c:1700
+#: builtin/submodule--helper.c:1788
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
-#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
msgid "path into the working tree"
msgstr "путь в рабочем каталоге"
-#: builtin/submodule--helper.c:1733
+#: builtin/submodule--helper.c:1853
msgid "path into the working tree, across nested submodule boundaries"
msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
-#: builtin/submodule--helper.c:1737
+#: builtin/submodule--helper.c:1857
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout или none"
-#: builtin/submodule--helper.c:1743
+#: builtin/submodule--helper.c:1863
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1866
msgid "parallel jobs"
msgstr "параллельные задачи"
-#: builtin/submodule--helper.c:1748
+#: builtin/submodule--helper.c:1868
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c:1869
msgid "don't print cloning progress"
msgstr "вы выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1876
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:1769
+#: builtin/submodule--helper.c:1889
msgid "bad value for update parameter"
msgstr "плохое значение для параметра update"
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1937
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "Ветка подмодуля (%s) настроена на наследование ветки из родительского проекта, но он не находится ни на одной ветке"
-#: builtin/submodule--helper.c:1954
+#: builtin/submodule--helper.c:2060
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2093
msgid "recurse into submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/submodule--helper.c:1960
-msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<путь>…]"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>…]"
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <имя> [<значение>]"
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <имя>"
+
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
-#: builtin/submodule--helper.c:2071
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s не поддерживает параметр --super-prefix"
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» не является подкомандой submodule--helper"
#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
-msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr "git tag [-a | -s | -u <key-id>] [-f] [-m <сообщение> | -F <файл>]\n\t\t<имя-метка> [<редакция>]"
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <имя-метки>…"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
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:29
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<формат>] <имя-метки>…"
-#: builtin/tag.c:87
+#: builtin/tag.c:88
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:103
+#: builtin/tag.c:104
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:134
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
-#: builtin/tag.c:137
+#: builtin/tag.c:138
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n"
-#: builtin/tag.c:191
+#: builtin/tag.c:192
msgid "unable to sign the tag"
msgstr "не удалось подписать метку"
-#: builtin/tag.c:193
+#: builtin/tag.c:194
msgid "unable to write tag file"
msgstr "не удалось записать файл метки"
-#: builtin/tag.c:218
+#: builtin/tag.c:210
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+
+#: builtin/tag.c:226
msgid "bad object type."
msgstr "неправильный тип объекта"
-#: builtin/tag.c:267
+#: builtin/tag.c:278
msgid "no tag message?"
msgstr "нет описания метки?"
-#: builtin/tag.c:274
+#: builtin/tag.c:285
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Сообщение метки было оставлено в %s\n"
-#: builtin/tag.c:383
+#: builtin/tag.c:396
msgid "list tag names"
msgstr "список названий меток"
-#: builtin/tag.c:385
+#: builtin/tag.c:398
msgid "print <n> lines of each tag message"
msgstr "печатать <n> строк описания от каждой метки"
-#: builtin/tag.c:387
+#: builtin/tag.c:400
msgid "delete tags"
msgstr "удалить метки"
-#: builtin/tag.c:388
+#: builtin/tag.c:401
msgid "verify tags"
msgstr "проверить метки"
-#: builtin/tag.c:390
+#: builtin/tag.c:403
msgid "Tag creation options"
msgstr "Настройки создания метки"
-#: builtin/tag.c:392
+#: builtin/tag.c:405
msgid "annotated tag, needs a message"
msgstr "для аннотированной метки нужно сообщение"
-#: builtin/tag.c:394
+#: builtin/tag.c:407
msgid "tag message"
msgstr "описание метки"
-#: builtin/tag.c:396
+#: builtin/tag.c:409
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:397
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr "аннотированная и подписанная с помощью GPG метка"
-#: builtin/tag.c:401
+#: builtin/tag.c:413
msgid "use another key to sign the tag"
msgstr "использовать другой ключ для подписания метки"
-#: builtin/tag.c:402
+#: builtin/tag.c:414
msgid "replace the tag if exists"
msgstr "замена метки, если она существует"
-#: builtin/tag.c:403 builtin/update-ref.c:369
+#: builtin/tag.c:415 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "создать журнал ссылок"
-#: builtin/tag.c:405
+#: builtin/tag.c:417
msgid "Tag listing options"
msgstr "Настройки вывода списка меток"
-#: builtin/tag.c:406
+#: builtin/tag.c:418
msgid "show tag list in columns"
msgstr "показать список меток по столбцам"
-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:419 builtin/tag.c:421
msgid "print only tags that contain the commit"
msgstr "вывод только меток, которые содержат коммит"
-#: builtin/tag.c:408 builtin/tag.c:410
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that don't contain the commit"
msgstr "вывод только меток, которые не содержат коммит"
-#: builtin/tag.c:411
+#: builtin/tag.c:423
msgid "print only tags that are merged"
msgstr "вывод только слитых меток"
-#: builtin/tag.c:412
+#: builtin/tag.c:424
msgid "print only tags that are not merged"
msgstr "вывод только не слитых меток"
-#: builtin/tag.c:417
+#: builtin/tag.c:428
msgid "print only tags of the object"
msgstr "вывод только меток, определенного объекта"
-#: builtin/tag.c:461
+#: builtin/tag.c:472
msgid "--column and -n are incompatible"
msgstr "--column и -n нельзя использовать одновременно"
-#: builtin/tag.c:483
+#: builtin/tag.c:494
msgid "-n option is only allowed in list mode"
msgstr "опцию -n можно использовать только в режиме списка"
-#: builtin/tag.c:485
+#: builtin/tag.c:496
msgid "--contains option is only allowed in list mode"
msgstr "опцию --contains можно использовать только в режиме списка"
-#: builtin/tag.c:487
+#: builtin/tag.c:498
msgid "--no-contains option is only allowed in list mode"
msgstr "опцию --no-contains можно использовать только в режиме списка"
-#: builtin/tag.c:489
+#: builtin/tag.c:500
msgid "--points-at option is only allowed in list mode"
msgstr "опцию --points-at можно использовать только в режиме списка"
-#: builtin/tag.c:491
+#: builtin/tag.c:502
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
-#: builtin/tag.c:502
+#: builtin/tag.c:513
msgid "only one -F or -m option is allowed."
msgstr "-F и -m нельзя использовать одновременно."
-#: builtin/tag.c:521
+#: builtin/tag.c:532
msgid "too many params"
msgstr "передано слишком много параметров"
-#: builtin/tag.c:527
+#: builtin/tag.c:538
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не является допустимым именем метки."
-#: builtin/tag.c:532
+#: builtin/tag.c:543
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже существует"
-#: builtin/tag.c:563
+#: builtin/tag.c:574
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
msgid "Unpacking objects"
msgstr "Распаковка объектов"
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "не удалось создать каталог %s"
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "не удалось создать файл %s"
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "не удалось удалить файл %s"
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "не удалось удалить каталог %s"
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка mtime в «%s» "
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "информация статистики каталога не изменяется после добавления нового файла"
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "информация статистики каталога не изменяется после добавления нового каталога"
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "информация статистики каталога изменяется после добавления нового файла"
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога"
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "информация статистики каталога не изменяется после удаления файла"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "информация статистики каталога не изменяется после удаления каталога"
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<опции>] [--] [<файл>…]"
-#: builtin/update-index.c:944
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "продолжить обновление, даже если индекс требует обновления"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "обновление: игнорировать подмодули"
-#: builtin/update-index.c:950
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "не игнорировать новые файлы"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "разрешить файлам заменять каталоги и наоборот"
-#: builtin/update-index.c:954
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "замечать файлы отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:956
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "обновить, даже если в индексе имеются не слитые записи"
-#: builtin/update-index.c:959
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "обновить информацию о статусе файлов"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "как --refresh, но игнорировать настройку assume-unchanged"
-#: builtin/update-index.c:967
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<режим доступа>,<объект>,<путь>"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "добавить указанную запись в индекс"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "пометить файлы как «не измененные»"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "убрать пометку assumed-unchanged"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "пометить файлы как «только в индексе»"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "убрать пометку skip-worktree"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "прочитать список обновляемых путей из стандартного ввода"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "добавить записи из стандартного ввода в индекс"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "заново заполнить индекс #2 и #3 для указанных путей"
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "обновить только записи, которые отличаются от HEAD"
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "вывести выполняемые действия на стандартный вывод"
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "записать индекс в указанном формате"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "разрешить или запретить раздельный индекс"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "включить/отключить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "записать индекс, даже если он не помечен как измененный"
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "включить или выключить мониторинг файловой системы"
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "пометить файл как действительный в мониторе файловой системы"
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "снять пометку действительности мониторе файловой системы"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1168
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:1145
+#: builtin/update-index.c:1177
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:1156
+#: builtin/update-index.c:1188
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:1160
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "Кэш неотслеживаемых файлов отключен"
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1200
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:1172
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кэш неотслеживаемых файлов включен для «%s»"
-#: builtin/update-index.c:1180
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы"
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "мониторинг файловой системы включён"
-#: builtin/update-index.c:1187
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы"
-#: builtin/update-index.c:1191
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "мониторинг файловой системы выключён"
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<опции>] <каталог>"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "выход после обмена одним запросом/ответом"
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "выходить сразу после начального объявления списка ссылок"
msgid "print tag contents"
msgstr "вывести содержимое метки"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<опции>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<опции>] <путь>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <рабочий-каталог> <новый-путь>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<опции>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<опции>] <рабочий-каталог>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <путь>"
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не является каталогом"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует"
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)"
-#: builtin/worktree.c:88
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
-#: builtin/worktree.c:96
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
-#: builtin/worktree.c:105
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
-#: builtin/worktree.c:152
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "вывести список удаленных рабочих каталогов"
-#: builtin/worktree.c:154
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "удалить рабочие каталоги старее чем <дата-окончания>"
-#: builtin/worktree.c:229
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже существует"
-#: builtin/worktree.c:260
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:302
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/worktree.c:373 builtin/worktree.c:379
+#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:375
+#: builtin/worktree.c:434
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:384
+#: builtin/worktree.c:443
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:390
+#: builtin/worktree.c:449
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:431
+#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:493
msgid "create a new branch"
msgstr "создать новую ветку"
-#: builtin/worktree.c:436
+#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr "создать или перейти на ветку"
-#: builtin/worktree.c:438
+#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr "наполнить новый рабочий каталог"
-#: builtin/worktree.c:439
+#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr "держать рабочий каталог заблокированным"
-#: builtin/worktree.c:441
+#: builtin/worktree.c:501
msgid "set up tracking mode (see git-branch(1))"
msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))"
-#: builtin/worktree.c:444
+#: builtin/worktree.c:504
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки"
-#: builtin/worktree.c:452
+#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach нельзя использовать одновременно"
-#: builtin/worktree.c:511
+#: builtin/worktree.c:573
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку"
-#: builtin/worktree.c:611
+#: builtin/worktree.c:673
msgid "reason for locking"
msgstr "причина блокировки"
-#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
-#: builtin/worktree.c:850
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» не является рабочим каталогом"
-#: builtin/worktree.c:625 builtin/worktree.c:658
+#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
-#: builtin/worktree.c:630
+#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» уже заблокирован, причина: %s"
-#: builtin/worktree.c:632
+#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» уже заблокирован"
-#: builtin/worktree.c:660
+#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» не заблокирован"
-#: builtin/worktree.c:685
+#: builtin/worktree.c:763
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:712 builtin/worktree.c:852
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:794 builtin/worktree.c:921
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:717
+#: builtin/worktree.c:799
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:723
+#: builtin/worktree.c:805
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:730
+#: builtin/worktree.c:813
#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:732
-msgid "cannot move a locked working tree"
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:735
+#: builtin/worktree.c:818
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:740
+#: builtin/worktree.c:823
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:788
+#: builtin/worktree.c:871
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:792
+#: builtin/worktree.c:875
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:797
+#: builtin/worktree.c:880
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:808 builtin/worktree.c:822
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: builtin/worktree.c:834
-msgid "force removing even if the worktree is dirty"
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:856
+#: builtin/worktree.c:926
#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:858
-msgid "cannot remove a locked working tree"
+#: builtin/worktree.c:928
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:861
+#: builtin/worktree.c:931
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<префикс>/"
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
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 "используется только при отладке"
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\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"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
"to read about a specific subcommand or concept."
msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
-#: git.c:173
+#: git.c:185
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:187
+#: git.c:199
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:201
+#: git.c:213
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:215
+#: git.c:227
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:237
+#: git.c:249
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:275
+#: git.c:287
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:300
+#: git.c:313
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:770
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:368
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:459
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:461
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:463
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:880
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:782
+#: git.c:892
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http.c:348
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d"
-#: http.c:369
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
-#: http.c:378
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning не поддерживается с cURL < 7.44.0"
-#: http.c:1854
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" redirect: %s"
msgstr "не удалось обновить базовый url из переадресации:\n запрошено: %s\n переадресовано: %s"
-#: remote-curl.c:401
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "«%s» недоступно: %s"
+
+#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "переадресация на %s"
-#: list-objects-filter-options.h:59
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "аргументы"
-#: list-objects-filter-options.h:60
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "фильтрация объектов"
-#: parse-options.h:157
+#: parse-options.h:170
msgid "expiry-date"
msgstr "дата-окончания"
-#: parse-options.h:172
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "ничего не делает (оставлено для обратной совместимости)"
-#: parse-options.h:251
+#: parse-options.h:304
msgid "be more verbose"
msgstr "быть многословнее"
-#: parse-options.h:253
+#: parse-options.h:306
msgid "be more quiet"
msgstr "тихий режим"
-#: parse-options.h:259
+#: parse-options.h:312
msgid "use <n> digits to display SHA-1s"
msgstr "использовать <n> цифр для вывода SHA-1"
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
+msgstr "как удалять пробелы и #комментарии из сообщения коммита"
+
+#: ref-filter.h:101
+msgid "key"
+msgstr "ключ"
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr "имя поля, по которому выполнить сортировку"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Добавление содержимого файла в индекс"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
-msgstr "Ð\9fÑ\80имениÑ\82Ñ\8c Ñ\81еÑ\80иÑ\8e патчей из почтового сообщения"
+msgstr "Ð\9fÑ\80именение Ñ\81еÑ\80ии патчей из почтового сообщения"
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr "Аннотировать строки файла информацией о коммитах"
+msgstr "Аннотирование строк файла информацией о коммитах"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
-msgstr "Ð\9fÑ\80имениÑ\82Ñ\8c паÑ\82Ñ\87 к файлам и/или индексу"
+msgstr "Ð\9fÑ\80именение паÑ\82Ñ\87а к файлам и/или индексу"
#: command-list.h:54
-msgid "Import an Arch repository into Git"
-msgstr "Импортировать репозиторий Arch в Git"
+msgid "Import a GNU Arch repository into Git"
+msgstr "Импортирование GNU Arch репозитория в Git"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
-msgstr "СделаÑ\82Ñ\8c аÑ\80Ñ\85ив файлов из указанного дерева"
+msgstr "Создание аÑ\80Ñ\85ива файлов из указанного дерева"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Ð\92Ñ\8bполниÑ\82Ñ\8c двоиÑ\87нÑ\8bй поиÑ\81к изменениÑ\8f, коÑ\82оÑ\80ое вносит ошибку"
+msgstr "Ð\92Ñ\8bполнение двоиÑ\87ного поиÑ\81ка коммиÑ\82а, коÑ\82оÑ\80Ñ\8bй вносит ошибку"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
-msgstr ""
+msgstr "Показ редакции и автора последнего изменившего каждую строку файла"
#: command-list.h:58
msgid "List, create, or delete branches"
-msgstr "Вывод списка веток, их создание или удаление"
+msgstr "Вывод списка, создание или удаление веток"
#: command-list.h:59
msgid "Move objects and refs by archive"
-msgstr ""
+msgstr "Перемещение объектов и ссылок по архиву"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
-msgstr ""
+msgstr "Вывод содержимого или типа и информации о размере для объектов репозитория"
#: command-list.h:61
msgid "Display gitattributes information"
-msgstr ""
+msgstr "Вывод информации из gitattributes"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
-msgstr ""
+msgstr "Отладка файлов gitignore / exclude"
#: command-list.h:63
msgid "Show canonical names and email addresses of contacts"
-msgstr ""
+msgstr "Вывод каноничных имён и адресов электронной почты контактов"
#: command-list.h:64
msgid "Switch branches or restore working tree files"
#: command-list.h:65
msgid "Copy files from the index to the working tree"
-msgstr ""
+msgstr "Копирование файлов из индекса в рабочий каталог"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
-msgstr ""
+msgstr "Удостовериться, что имя ссылки правильно сформировано"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
-msgstr ""
+msgstr "Поиск коммитов которые еще не применены вышестоящим репозиторием"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
-msgstr ""
+msgstr "Применение изменений, сделанных в каком-то существующем коммите"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
-msgstr ""
+msgstr "Графическая альтернатива для git-commit"
#: command-list.h:70
msgid "Remove untracked files from the working tree"
-msgstr ""
+msgstr "Удаление неотслеживаемых файлов из рабочего каталога"
#: command-list.h:71
msgid "Clone a repository into a new directory"
#: command-list.h:72
msgid "Display data in columns"
-msgstr ""
+msgstr "Вывод данных по колонкам"
#: command-list.h:73
msgid "Record changes to the repository"
msgstr "Запись изменений в репозиторий"
#: command-list.h:74
-msgid "Write and verify Git commit graph files"
-msgstr ""
+msgid "Write and verify Git commit-graph files"
+msgstr "Запись и проверка commit-graph файлов Git"
#: command-list.h:75
msgid "Create a new commit object"
-msgstr ""
+msgstr "Создание нового объекта коммита"
#: command-list.h:76
msgid "Get and set repository or global options"
-msgstr ""
+msgstr "Получение и установка глобальных опций или опций репозитория"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
+msgstr "Подсчет количества неупакованных объектов и их потребления диска"
#: command-list.h:78
msgid "Retrieve and store user credentials"
-msgstr ""
+msgstr "Получение и сохранение учетных записей пользователя"
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
-msgstr ""
+msgstr "Помощник для временного хранения паролей в памяти"
#: command-list.h:80
msgid "Helper to store credentials on disk"
-msgstr ""
+msgstr "Помощник для хранения учетных записей на диске"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
-msgstr ""
+msgstr "Экспорт единственного коммита в виде рабочей копии CVS"
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
+msgstr "Спасение ваших данных из другой СКВ которую люди любят ненавидеть"
#: command-list.h:83
msgid "A CVS server emulator for Git"
-msgstr ""
+msgstr "Эмулятор сервера CVS для Git"
#: command-list.h:84
msgid "A really simple server for Git repositories"
-msgstr ""
+msgstr "Очень простой сервер для Git репозиториев"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
-msgstr ""
+msgstr "Присвоение объекту удобочитаемое имя на основе доступной ссылки"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
#: command-list.h:87
msgid "Compares files in the working tree and the index"
-msgstr ""
+msgstr "Сравнение седержимого файлов в рабочем каталоге с файлами в индексе"
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
-msgstr ""
+msgstr "Сравнение дерева файлов с рабочим каталогом или индексом"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr ""
+msgstr "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева"
#: command-list.h:90
msgid "Show changes using common diff tools"
-msgstr ""
+msgstr "Показ изменений с помощью распространенных утилит сравнения"
#: command-list.h:91
msgid "Git data exporter"
-msgstr ""
+msgstr "Экспорт данных Git"
#: command-list.h:92
msgid "Backend for fast Git data importers"
-msgstr ""
+msgstr "Внутренний интерфейс для быстрого импорта данных Git"
#: command-list.h:93
msgid "Download objects and refs from another repository"
#: command-list.h:94
msgid "Receive missing objects from another repository"
-msgstr ""
+msgstr "Получение недостающих объектов из другого репозитория"
#: command-list.h:95
msgid "Rewrite branches"
-msgstr ""
+msgstr "Перезапись веток"
#: command-list.h:96
msgid "Produce a merge commit message"
-msgstr ""
+msgstr "Создание сообщения коммита для слияния"
#: command-list.h:97
msgid "Output information on each ref"
-msgstr ""
+msgstr "Вывод информации о каждой ссылке"
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
-msgstr ""
+msgstr "Подготовка патчей для отправки по электронной почте"
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr ""
+msgstr "Проверка связности и валидности объектов в базе данных"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "Очистка ненужных файлов и оптимизация локального репозитория"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
+msgstr "Извлечение идентификатора коммита из архива, созданного с помощью git-archive"
#: command-list.h:102
msgid "Print lines matching a pattern"
#: command-list.h:103
msgid "A portable graphical interface to Git"
-msgstr ""
+msgstr "Портативный графический интерфейс для Git"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
-msgstr ""
+msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла"
#: command-list.h:105
msgid "Display help information about Git"
-msgstr ""
+msgstr "Отображение справочной информации о Git"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "Серверная реализация протокола Git над HTTP"
#: command-list.h:107
msgid "Download from a remote Git repository via HTTP"
-msgstr ""
+msgstr "Загрузка из внешнего репозитория Git с помощью HTTP"
#: command-list.h:108
msgid "Push objects over HTTP/DAV to another repository"
-msgstr ""
+msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV"
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
+msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP"
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
-msgstr ""
+msgstr "Построение файла индекса для существующего упакованного архива"
#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
-msgstr ""
+msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb"
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
-msgstr ""
+msgid "Add or parse structured information in commit messages"
+msgstr "Добавление или разбор структурированной информации в сообщениях коммита"
#: command-list.h:114
msgid "The Git repository browser"
-msgstr ""
+msgstr "Браузер репозитория Git"
#: command-list.h:115
msgid "Show commit logs"
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
-msgstr ""
+msgstr "Вывод информации о файлах в индексе и в рабочем каталоге"
#: command-list.h:117
msgid "List references in a remote repository"
-msgstr ""
+msgstr "Вывод списка ссылок во внешнем репозитории"
#: command-list.h:118
msgid "List the contents of a tree object"
-msgstr ""
+msgstr "Вывод содержимого объекта дерева"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
+msgstr "Извлекает патч и авторство из одного сообщения электронной почты"
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
-msgstr ""
+msgstr "Простая программа UNIX для разбора файла mbox"
#: command-list.h:121
msgid "Join two or more development histories together"
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
-msgstr ""
+msgstr "Поиск подходящих общих предков для возможного слияния"
#: command-list.h:123
msgid "Run a three-way file merge"
-msgstr ""
+msgstr "Запуск трёхходового слияния файлов"
#: command-list.h:124
msgid "Run a merge for files needing merging"
-msgstr ""
+msgstr "Запуск слияния для файлов, которые требуют слияния"
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
-msgstr ""
+msgstr "Стандартная программа-помощник для использования совместно с git-merge-index"
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
+msgstr "Запуск инструментов разрешения конфликтов слияния"
#: command-list.h:127
msgid "Show three-way merge without touching index"
-msgstr ""
+msgstr "Вывод трёхходового слияние без затрагивания индекса"
#: command-list.h:128
-msgid "Creates a tag object"
-msgstr ""
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запись и проверка файлов multi-pack-index"
#: command-list.h:129
-msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
+msgid "Creates a tag object"
+msgstr "Создание объектов меток"
#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Построение объекта дерева из текста формата ls-tree"
+
+#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Перемещение или переименование файла, каталога или символьной ссылки"
-#: command-list.h:131
+#: command-list.h:132
msgid "Find symbolic names for given revs"
-msgstr ""
+msgstr "Поиск символьных имён для указанных редакций"
-#: command-list.h:132
+#: command-list.h:133
msgid "Add or inspect object notes"
-msgstr ""
+msgstr "Добавление или просмотр заметок объекта"
-#: command-list.h:133
+#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
-msgstr ""
+msgstr "Импорт и отправка в репозитории Perforce"
-#: command-list.h:134
+#: command-list.h:135
msgid "Create a packed archive of objects"
-msgstr ""
+msgstr "Создание упакованного архива объектов"
-#: command-list.h:135
+#: command-list.h:136
msgid "Find redundant pack files"
-msgstr ""
+msgstr "Поиск избыточных файлов пакетов"
-#: command-list.h:136
+#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
-msgstr ""
+msgstr "Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
-#: command-list.h:137
+#: command-list.h:138
msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
+msgstr "Подпрограммы для помощи разбора параметров доступа внешнего репозитория"
-#: command-list.h:138
+#: command-list.h:139
msgid "Compute unique ID for a patch"
-msgstr ""
+msgstr "Вычисление уникального идентификатора для патча"
-#: command-list.h:139
+#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
-msgstr ""
+msgstr "Очистка всех недостижимых объектов из базы данных объектов"
-#: command-list.h:140
+#: command-list.h:141
msgid "Remove extra objects that are already in pack files"
-msgstr ""
+msgstr "Удаление дополнительных объектов, которые уже содержатся в файлах пакетов"
-#: command-list.h:141
+#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Извлечение изменений и объединение с другим репозиторием или локальной веткой"
-#: command-list.h:142
+#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr "Обновление внешних ссылок и связанных объектов"
-#: command-list.h:143
+#: command-list.h:144
msgid "Applies a quilt patchset onto the current branch"
-msgstr ""
+msgstr "Применение упорядоченного списка патчей над текущей веткой"
-#: command-list.h:144
+#: command-list.h:145
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
+msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)"
-#: command-list.h:145
+#: command-list.h:146
msgid "Reads tree information into the index"
-msgstr ""
+msgstr "Чтение информации о дереве в индекс"
-#: command-list.h:146
+#: command-list.h:147
msgid "Reapply commits on top of another base tip"
-msgstr "Повторно применить коммиты над верхушкой другой ветки"
+msgstr "Повторное применение коммитов над верхушкой другой ветки"
-#: command-list.h:147
+#: command-list.h:148
msgid "Receive what is pushed into the repository"
-msgstr ""
+msgstr "Получение того, что было отправлено в репозиторий"
-#: command-list.h:148
+#: command-list.h:149
msgid "Manage reflog information"
-msgstr ""
+msgstr "Управление информацией журнала ссылок"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage set of tracked repositories"
-msgstr ""
+msgstr "Управление набором отслеживаемых репозиториев"
-#: command-list.h:150
+#: command-list.h:151
msgid "Pack unpacked objects in a repository"
-msgstr ""
+msgstr "Упаковка неупакованных объектов в репозитории"
-#: command-list.h:151
+#: command-list.h:152
msgid "Create, list, delete refs to replace objects"
-msgstr ""
+msgstr "Создание, вывод списка, удаление ссылок для замены объектов"
-#: command-list.h:152
+#: command-list.h:153
msgid "Generates a summary of pending changes"
-msgstr ""
+msgstr "Генерация сводки предстоящих изменений"
-#: command-list.h:153
+#: command-list.h:154
msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+msgstr "Повторное использование записанных разрешений конфликтов при слияниях"
-#: command-list.h:154
+#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "Сброс текущего состояния HEAD на указанное состояние"
-#: command-list.h:155
+#: command-list.h:156
msgid "Revert some existing commits"
-msgstr ""
+msgstr "Обращение изменений существующих коммитов"
-#: command-list.h:156
+#: command-list.h:157
msgid "Lists commit objects in reverse chronological order"
-msgstr ""
+msgstr "Вывод списка объектов коммита в обратном хронологическом порядке"
-#: command-list.h:157
+#: command-list.h:158
msgid "Pick out and massage parameters"
-msgstr ""
+msgstr "Разбор и обработка параметров"
-#: command-list.h:158
+#: command-list.h:159
msgid "Remove files from the working tree and from the index"
msgstr "Удаление файлов из рабочего каталога и индекса"
-#: command-list.h:159
+#: command-list.h:160
msgid "Send a collection of patches as emails"
-msgstr ""
+msgstr "Отправка коллекции патчей на электронную почту"
-#: command-list.h:160
+#: command-list.h:161
msgid "Push objects over Git protocol to another repository"
-msgstr ""
+msgstr "Отправка объектов в другой репозиторий с помощью протокола Git"
-#: command-list.h:161
+#: command-list.h:162
msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
+msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH"
-#: command-list.h:162
+#: command-list.h:163
msgid "Summarize 'git log' output"
-msgstr ""
+msgstr "Обобщение вывода «git log»"
-#: command-list.h:163
+#: command-list.h:164
msgid "Show various types of objects"
msgstr "Вывод различных типов объектов"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show branches and their commits"
-msgstr ""
+msgstr "Вывод веток и их коммитов"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show packed archive index"
-msgstr ""
+msgstr "Вывод индекса упакованного архива"
-#: command-list.h:166
+#: command-list.h:167
msgid "List references in a local repository"
-msgstr ""
+msgstr "Вывод ссылок в локальном репозитории"
-#: command-list.h:167
+#: command-list.h:168
msgid "Git's i18n setup code for shell scripts"
-msgstr ""
+msgstr "Код настройки интернационализации для сценариев оболочки Git"
-#: command-list.h:168
+#: command-list.h:169
msgid "Common Git shell script setup code"
-msgstr ""
+msgstr "Общий код настройки для сценариев оболочки Git"
-#: command-list.h:169
+#: command-list.h:170
msgid "Stash the changes in a dirty working directory away"
-msgstr ""
+msgstr "Спрятать изменения в изменённом рабочем каталоге"
-#: command-list.h:170
+#: command-list.h:171
msgid "Add file contents to the staging area"
-msgstr ""
+msgstr "Добавление содержимого файлов в индекс"
-#: command-list.h:171
+#: command-list.h:172
msgid "Show the working tree status"
msgstr "Вывод состояния рабочего каталога"
-#: command-list.h:172
+#: command-list.h:173
msgid "Remove unnecessary whitespace"
-msgstr ""
+msgstr "Удаление ненужных пробелов"
-#: command-list.h:173
+#: command-list.h:174
msgid "Initialize, update or inspect submodules"
-msgstr ""
+msgstr "Инициализация, обновление или просмотр подмодулей"
-#: command-list.h:174
+#: command-list.h:175
msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr ""
+msgstr "Двухсторонние операции между репозиториями Subversion и Git"
-#: command-list.h:175
+#: command-list.h:176
msgid "Read, modify and delete symbolic refs"
-msgstr ""
+msgstr "Чтение, изменение и удаление символических ссылок"
-#: command-list.h:176
+#: command-list.h:177
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Создание метки, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
+msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
-#: command-list.h:177
+#: command-list.h:178
msgid "Creates a temporary file with a blob's contents"
-msgstr ""
+msgstr "Создание временного файла с содержимым двоичного объекта"
-#: command-list.h:178
+#: command-list.h:179
msgid "Unpack objects from a packed archive"
-msgstr ""
+msgstr "Распаковка объектов из упакованного архива"
-#: command-list.h:179
+#: command-list.h:180
msgid "Register file contents in the working tree to the index"
-msgstr ""
+msgstr "Регистрация содержимого файла из рабочего каталога в индекс"
-#: command-list.h:180
+#: command-list.h:181
msgid "Update the object name stored in a ref safely"
-msgstr ""
+msgstr "Безопасное обновление имени объекта хранящегося в ссылке"
-#: command-list.h:181
+#: command-list.h:182
msgid "Update auxiliary info file to help dumb servers"
-msgstr ""
+msgstr "Обновление файла со вспомогательной информацией для глупых серверов"
-#: command-list.h:182
+#: command-list.h:183
msgid "Send archive back to git-archive"
-msgstr ""
+msgstr "Отправка архива обратно в git-archive"
-#: command-list.h:183
+#: command-list.h:184
msgid "Send objects packed back to git-fetch-pack"
-msgstr ""
+msgstr "Отправка упакованных объектов обратно в git-fetch-pack"
-#: command-list.h:184
+#: command-list.h:185
msgid "Show a Git logical variable"
-msgstr ""
+msgstr "Вывод логической переменной Git"
-#: command-list.h:185
+#: command-list.h:186
msgid "Check the GPG signature of commits"
-msgstr ""
+msgstr "Проверка подписи GPG коммитов"
-#: command-list.h:186
+#: command-list.h:187
msgid "Validate packed Git archive files"
-msgstr ""
+msgstr "Проверка файлов упакованных архивов Git"
-#: command-list.h:187
+#: command-list.h:188
msgid "Check the GPG signature of tags"
-msgstr ""
+msgstr "Проверка подписи GPG меток"
-#: command-list.h:188
+#: command-list.h:189
msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
+msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)"
-#: command-list.h:189
+#: command-list.h:190
msgid "Show logs with difference each commit introduces"
-msgstr ""
+msgstr "Вывод журнала с изменениями, которые вводил каждый из коммитов"
-#: command-list.h:190
+#: command-list.h:191
msgid "Manage multiple working trees"
-msgstr ""
+msgstr "Управление несколькими рабочими каталогами"
-#: command-list.h:191
+#: command-list.h:192
msgid "Create a tree object from the current index"
-msgstr ""
+msgstr "Создание объекта дерева из текущего индекса"
-#: command-list.h:192
+#: command-list.h:193
msgid "Defining attributes per path"
msgstr "Определение атрибутов для путей файлов или каталогов"
-#: command-list.h:193
+#: command-list.h:194
msgid "Git command-line interface and conventions"
-msgstr ""
+msgstr "Интерфейс коммандной строки Git и соглашения"
-#: command-list.h:194
+#: command-list.h:195
msgid "A Git core tutorial for developers"
-msgstr ""
+msgstr "Учебник по ядру Git для разработчиков"
-#: command-list.h:195
+#: command-list.h:196
msgid "Git for CVS users"
-msgstr ""
+msgstr "Git для пользователей CVS"
-#: command-list.h:196
+#: command-list.h:197
msgid "Tweaking diff output"
-msgstr ""
+msgstr "Подстройка вывода списка изменений"
-#: command-list.h:197
+#: command-list.h:198
msgid "A useful minimum set of commands for Everyday Git"
-msgstr ""
+msgstr "Полезный минимум команд для каждодневного использования Git"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git Glossary"
-msgstr ""
+msgstr "Глоссарий Git"
-#: command-list.h:199
+#: command-list.h:200
msgid "Hooks used by Git"
-msgstr ""
+msgstr "Перехватчики используемые Git"
-#: command-list.h:200
+#: command-list.h:201
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание специально игнорируемых файлов"
-#: command-list.h:201
+#: command-list.h:202
msgid "Defining submodule properties"
msgstr "Определение свойств подмодулей"
-#: command-list.h:202
+#: command-list.h:203
msgid "Git namespaces"
-msgstr ""
+msgstr "Пространства имён Git"
-#: command-list.h:203
+#: command-list.h:204
msgid "Git Repository Layout"
-msgstr ""
+msgstr "Содержимое репозитория Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов для Git"
-#: command-list.h:205
+#: command-list.h:206
msgid "A tutorial introduction to Git: part two"
-msgstr ""
+msgstr "Обучающее введение в Git: часть вторая"
-#: command-list.h:206
+#: command-list.h:207
msgid "A tutorial introduction to Git"
-msgstr ""
+msgstr "Обучающее введение в Git"
-#: command-list.h:207
+#: command-list.h:208
msgid "An overview of recommended workflows with Git"
msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
-msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
-
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "Вам нужно начать с помощью «git bisect start»"
msgid "Do you want me to do it for you [Y/n]? "
msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "неопознанная опция: «$arg»"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "«$arg» не похоже на действительную редакцию"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Плохой указатель HEAD — Необходим указатель HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "Сбой перехода на «$start_head». Попробуйте выполнить «git bisect reset <существующая-ветка>»."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Плохой указатель HEAD — странная символьная ссылка"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Плохой аргумент bisect_write: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Плохой ввод номера редакции: $bisected_head"
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Плохой ввод номера редакции: $rev"
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Предупреждение: попытка двоичного поиска с указанием только $TERM_BAD коммита."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr "Вы уверены [Y - да/n - нет]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr "Вам нужно передать мне как минимум одну $bad_syn и одну $good_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $bad_syn» и «git bisect $good_syn».)"
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr "Для начала нужно запустить «git bisect start».\nПосле этого, вам нужно передать мне как минимум одну $good_syn и одну $bad_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $good_syn» и «git bisect $good_syn».)"
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "Вы сейчас не в процессе бинарного поиска."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "«$invalid» не является действительным коммитом"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr "Не удалось перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запустить «git bisect reset <коммит>»."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr "Не передан файл журнала"
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "не удалось прочитать $file для повтора изменений"
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? вы о чем?"
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "сбой при выполнении двоичного поиска: не передана команда."
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "запускаю $command"
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128"
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "bisect run больше не может продолжать"
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res"
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
-msgstr "bisect run выполнен успешно"
-
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Недопустимая команда: вы сейчас находитесь на $TERM_BAD/$TERM_GOOD двоичном поиске."
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr "определения не заданы"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr "недопустимый аргумент $arg для «git bisect terms».\nПоддерживаемые параметры: --term-good|--term-old и --term-bad|--term-new."
+msgstr "bisect run выполнен успешно"
+
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "Вы сейчас не в процессе бинарного поиска."
#: git-merge-octopus.sh:46
msgid ""
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простое слияние не удалось, попытка автоматического слияния."
-#: git-rebase.sh:61
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
-msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
-
-#: git-rebase.sh:173 git-rebase.sh:454
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Не удалось перейти назад на $head_name"
-
-#: git-rebase.sh:184
-msgid "Applied autostash."
-msgstr "Применены автоматически спрятанные изменения."
-
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Не удалось сохранить $stash_sha1"
-
-#: git-rebase.sh:236
-msgid "The pre-rebase hook refused to rebase."
-msgstr "Перехватчик pre-rebase отказал в перемещении."
-
-#: git-rebase.sh:241
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
-
-#: git-rebase.sh:415
-msgid "No rebase in progress?"
-msgstr "Нет перемещения в процессе?"
-
-#: git-rebase.sh:426
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
-
-#: git-rebase.sh:433
-msgid "Cannot read HEAD"
-msgstr "Не удалось прочитать HEAD"
-
-#: git-rebase.sh:436
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
-
-#: git-rebase.sh:480
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное."
-
-#: git-rebase.sh:545
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-
-#: git-rebase.sh:556
-msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
-msgstr ""
-
-#: git-rebase.sh:562
-msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
-msgstr ""
-
-#: git-rebase.sh:564
-msgid "error: cannot combine '--rebase_merges' with '--strategy'"
-msgstr ""
-
-#: git-rebase.sh:590
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr "недействительная вышестоящая ветка «$upstream_name»"
-
-#: git-rebase.sh:614
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: имеется больше одной базы слияния"
-
-#: git-rebase.sh:617 git-rebase.sh:621
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: нет базы слияния"
-
-#: git-rebase.sh:626
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Не указывает на действительный коммит: $onto_name"
-
-#: git-rebase.sh:652
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr "критическая ошибка: нет такой ветки/коммита «$branch_name»"
-
-#: git-rebase.sh:685
-msgid "Cannot autostash"
-msgstr "Не удалось автоматически спрятать изменения"
-
-#: git-rebase.sh:690
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Изменения автоматически спрятаны: $stash_abbrev"
-
-#: git-rebase.sh:694
-msgid "Please commit or stash them."
-msgstr "Сделайте коммит или спрячьте их."
-
-#: git-rebase.sh:717
-#, sh-format
-msgid "HEAD is up to date."
-msgstr "HEAD уже в актуальном состоянии."
-
-#: git-rebase.sh:719
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "Текущая ветка $branch_name уже в актуальном состоянии."
-
-#: git-rebase.sh:727
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
-msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
-
-#: git-rebase.sh:729
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Текущая ветка $branch_name уже в актуальном состоянии, принудительное перемещение."
-
-#: git-rebase.sh:741
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Изменения от $mb до $onto:"
-
-#: git-rebase.sh:750
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…"
-
-#: git-rebase.sh:760
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Перемотана вперед $branch_name до $onto_name."
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash очистка с параметрами не реализована"
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr "У вас еще нет начального коммита"
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr "Не удалось сохранить текущее состояние индекса"
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr "Невозможно сохранить неотслеживаемые файлы"
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr "Не удалось сохранить текущее состояние рабочего каталога"
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr "Изменения не выбраны"
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "Не удалось удалить временный индекс (не должно случаться)"
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr "Не удалось записать состояние рабочего каталога"
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Не удалось обновить $ref_stash с помощью $w_commit"
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "ошибка: неизвестный параметр для «stash push»: $option"
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr "Нет локальных изменений для сохранения"
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr "Не удалось инициализировать спрятанные изменения"
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr "Не удалось сохранить текущий статус"
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg"
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr "Не удалось удалить изменения рабочего каталога"
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "неизвестная опция: $opt"
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr "Не найдены спрятанные изменения."
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Передано слишком много редакций: $REV"
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference не является действительной ссылкой"
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» не похоже на коммит со спрятанными изменениями"
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» не является ссылкой на спрятанные изменения"
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "не удалось обновить индекс"
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Нельзя применить спрятанные изменения во время выполнения слияния"
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "Конфликты в индексе. Попробуйте без --index."
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "Не удалось сохранить дерево индекса"
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений"
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "Невозможно убрать из индекса измененные файлы"
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr "Индекс не был извлечён из спрятанных изменений."
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Отброшено ${REV} ($s)"
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений"
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr "Не указано имя ветки"
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы восстановить их, наберите «git stash apply»)"
-#: git-submodule.sh:188
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога"
-#: git-submodule.sh:198
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../"
-#: git-submodule.sh:217
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже содержится в индексе"
-#: git-submodule.sh:220
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "«$sm_path» уже содержится в индексе и не является подмодулем"
-#: git-submodule.sh:226
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить."
-#: git-submodule.sh:249
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
-#: git-submodule.sh:251
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "«$sm_path» уже существует и не является действительным репозиторием git"
-#: git-submodule.sh:259
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:"
-#: git-submodule.sh:261
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"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:267
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
-#: git-submodule.sh:279
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
-#: git-submodule.sh:284
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой добавления подмодуля «$sm_path»"
-#: git-submodule.sh:293
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
-#: git-submodule.sh:565
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:575
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:580
+#: git-submodule.sh:588
#, 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:603
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:612
#, 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:616
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:617
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
-#: git-submodule.sh:621
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:622
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:627
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:628
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
-#: git-submodule.sh:633
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:634
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:665
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:761
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached нельзя использовать одновременно с опцией --files"
-#: git-submodule.sh:813
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвестный режим $mod_dst"
-#: git-submodule.sh:833
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_src"
-#: git-submodule.sh:836
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst"
-#: git-submodule.sh:839
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst"
msgid "See git-${cmd}(1) for details."
msgstr "Для дополнительной информации, смотрите git-${cmd}(1)."
-#: git-rebase--interactive.sh:43
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <command> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n"
-
-#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n"
-
-#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
-msgid "could not detach HEAD"
-msgstr "не удалось отделить HEAD"
-
-#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
-
-#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
-msgid "Could not execute editor"
-msgstr "Не удалось запустить редактор"
-
-#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Не удалось перейти на версию $switch_to"
-
-#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
-msgid "No HEAD?"
-msgstr "Нет указателя HEAD?"
-
-#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Не удалось создать временный каталог $state_dir"
-
-#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
-msgid "Could not mark as interactive"
-msgstr "Не удалось пометить как интерактивный"
-
-#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)"
-msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)"
-msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-
-#: git-rebase--interactive.sh:224
-msgid ""
-"\n"
-"\tHowever, if you remove everything, the rebase will be aborted.\n"
-"\n"
-"\t"
-msgstr ""
-
-#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
-msgid "Note that empty commits are commented out"
-msgstr "Заметьте, что пустые коммиты закомментированны"
-
-#: git-rebase--interactive.sh:280
-msgid "Could not generate todo list"
-msgstr "Не удалось сгенерировать список дел"
-
#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
+msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
#: git-rebase--preserve-merges.sh:215
#, sh-format
"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"
"you are able to reword the commit."
-msgstr "Ð\9dе Ñ\83долось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
+msgstr "Ð\9dе Ñ\83далось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Could not commit staged changes."
msgstr "Не удалось закоммитить проиндексированные изменения."
-#: git-rebase--preserve-merges.sh:893
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr "Не удалось запустить редактор"
+
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Не удалось перейти на версию $switch_to"
+
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr "Нет указателя HEAD?"
+
+#: git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Не удалось создать временный каталог $state_dir"
+
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr "Не удалось пометить как интерактивный"
+
+#: git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)"
+msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)"
+msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
+msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
msgid "Could not init rewritten commits"
msgid "usage: $dashless $USAGE"
msgstr "использование: $dashless $USAGE"
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "Не удалось выполнить chdir в $cdup, вершину рабочего каталога"
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "критическая ошибка: $program_name нельзя использовать не имея рабочего каталога."
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "Не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "Не удалось выполнить перезапись веток: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "Не удалось получить с перемещением: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "Не удалось выполнить $action: У вас есть непроиндексированные изменения."
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "Не удалось выполнить перемещение коммитов: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "Не удалось получить с перемещением: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "Не удалось выполнить $action: В вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "К тому же, в вашем индексе есть незакоммиченные изменения."
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "Вам нужно запускать эту команду находясь на вершине рабочего каталога."
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "Не удалось определить абсолютный путь к каталогу git"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of changes\n"
-msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть различия между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
+msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть изменения между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
msgid "invalid argument %s, expecting --"
msgstr "недопустимый аргумент %s, ожидается --"
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "локальный часовой пояс отличается от GMT на не минутный интервал\n"
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "локальный сдвиг времени больше или равен 24 часа\n"
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr "редактор был завершен с ошибкой, отменяю всё"
-#: git-send-email.perl:294
+#: git-send-email.perl:302
#, perl-format
msgid "'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n"
-#: git-send-email.perl:299
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» содержит подготовленное письмо.\n"
-#: git-send-email.perl:317
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases не совместимо с другими опциями\n"
-#: git-send-email.perl:383 git-send-email.perl:638
+#: git-send-email.perl:395 git-send-email.perl:656
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Нельзя запускать git format-patch вне репозитория\n"
-#: git-send-email.perl:386
+#: git-send-email.perl:398
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:456
+#: git-send-email.perl:470
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Неизвестное поле --suppress-cc: «%s»\n"
-#: git-send-email.perl:485
+#: git-send-email.perl:501
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Неизвестный параметр --confirm: «%s»\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:529
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
-#: git-send-email.perl:515
+#: git-send-email.perl:531
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "предупреждение: «:include:» не поддерживается: %s\n"
-#: git-send-email.perl:517
+#: git-send-email.perl:533
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
-#: git-send-email.perl:522
+#: git-send-email.perl:538
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "предупреждение: строка sendmail не распознана: %s\n"
-#: git-send-email.perl:604
+#: git-send-email.perl:622
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 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:625
+#: git-send-email.perl:643
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Не удалось выполнить opendir %s: %s"
-#: git-send-email.perl:649
+#: git-send-email.perl:667
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
-#: git-send-email.perl:660
+#: git-send-email.perl:678
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr "\nФайл с патчем не указан!\n\n"
-#: git-send-email.perl:673
+#: git-send-email.perl:691
#, perl-format
msgid "No subject line in %s?"
msgstr "Нет строки с темой в %s?"
-#: git-send-email.perl:683
+#: git-send-email.perl:701
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Не удалось открыть для записи %s: %s"
-#: git-send-email.perl:694
+#: git-send-email.perl:712
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"for the patch you are writing.\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
-msgstr "СÑ\82Ñ\80оки, наÑ\87инаÑ\8eÑ\89иеÑ\81Ñ\8f Ñ\81 «GIT:» бÑ\83дÑ\83Ñ\82 Ñ\83даленÑ\8b.\nÐ\92озможно бÑ\83деÑ\82 полезно вклÑ\8eÑ\87иÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 добавлений\nи Ñ\83далений или Ñ\82аблиÑ\86Ñ\83 Ñ\81одеÑ\80жимого в паÑ\82Ñ\87, коÑ\82оÑ\80Ñ\8bй вÑ\8b пиÑ\88еÑ\82е.\n\nÐ\9eÑ\87иÑ\81Ñ\82иÑ\82е Ñ\81одеÑ\80жимое, еÑ\81ли вÑ\8b не Ñ\85оÑ\82иÑ\82е оÑ\82пÑ\80авлÑ\8fÑ\82Ñ\8c пиÑ\81Ñ\8cмо Ñ\81 кÑ\80аÑ\82кой инÑ\84оÑ\80маÑ\86ией.\n"
+msgstr "СÑ\82Ñ\80оки, наÑ\87инаÑ\8eÑ\89иеÑ\81Ñ\8f Ñ\81 «GIT:» бÑ\83дÑ\83Ñ\82 Ñ\83даленÑ\8b.\nÐ\92озможно бÑ\83деÑ\82 полезно вклÑ\8eÑ\87иÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82иÑ\81Ñ\82икÑ\83 добавлений\nи Ñ\83далений или Ñ\82аблиÑ\86Ñ\83 Ñ\81одеÑ\80жимого к Ñ\81оздаваемомÑ\83 паÑ\82Ñ\87Ñ\83.\n\nÐ\9eÑ\87иÑ\81Ñ\82иÑ\82е Ñ\81одеÑ\80жимое, еÑ\81ли вÑ\8b не Ñ\85оÑ\82иÑ\82е оÑ\82пÑ\80авлÑ\8fÑ\82Ñ\8c пиÑ\81Ñ\8cмо Ñ\81о Ñ\81водкой изменений.\n"
-#: git-send-email.perl:718
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Не удалось открыть %s: %s"
-#: git-send-email.perl:735
+#: git-send-email.perl:753
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Не удалось открыть %s.final: %s"
-#: git-send-email.perl:778
+#: git-send-email.perl:796
msgid "Summary email is empty, skipping it\n"
-msgstr "Письмо с краткой информацией пустое, попускаю его\n"
+msgstr "Письмо со сводкой изменений пустое, попускаю его\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:813
+#: git-send-email.perl:831
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Вы уверены, что хотите использовать <%s> [y/N]? "
-#: git-send-email.perl:868
+#: git-send-email.perl:886
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:873
+#: git-send-email.perl:891
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
-#: git-send-email.perl:881
+#: git-send-email.perl:899
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n"
-#: git-send-email.perl:900
+#: git-send-email.perl:918
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Кому должны быть отправлены письма (если нужно)?"
-#: git-send-email.perl:918
+#: git-send-email.perl:936
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
-#: git-send-email.perl:930
+#: git-send-email.perl:948
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:988 git-send-email.perl:996
+#: git-send-email.perl:1006 git-send-email.perl:1014
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ошибка: не удалось выделить действительный адрес из: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1000
+#: git-send-email.perl:1018
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): "
-#: git-send-email.perl:1317
+#: git-send-email.perl:1335
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "путь CA «%s» не существует"
-#: git-send-email.perl:1400
+#: git-send-email.perl:1418
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1415
+#: git-send-email.perl:1433
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - все): "
-#: git-send-email.perl:1418
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr "Отправка этого ответа на письмо обязательна"
-#: git-send-email.perl:1446
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr "Требуемый SMTP сервер не был правильно объявлен."
-#: git-send-email.perl:1493
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сервер не поддерживает STARTTLS! %s"
-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Ошибка STARTTLS! %s"
-#: git-send-email.perl:1511
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug."
-#: git-send-email.perl:1529
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr "Не удалось отправить %s\n"
-#: git-send-email.perl:1532
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Имитация отправки %s\n"
-#: git-send-email.perl:1532
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr "Отправлено %s\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr "Имитация OK. Журнал содержит:\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr "OK. Журнал содержит:\n"
-#: git-send-email.perl:1546
+#: git-send-email.perl:1564
msgid "Result: "
msgstr "Результат: "
-#: git-send-email.perl:1549
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr "Результат: OK\n"
-#: git-send-email.perl:1567
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr "не удалось открыть файл %s"
-#: git-send-email.perl:1614 git-send-email.perl:1634
+#: git-send-email.perl:1632 git-send-email.perl:1652
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1620
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавление to: %s со строки «%s»\n"
-#: git-send-email.perl:1673
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1698
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1809
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не удалось выполнить «%s»"
-#: git-send-email.perl:1816
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавление %s: %s из: «%s»\n"
-#: git-send-email.perl:1820
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) не удалось закрыть поток к «%s»"
-#: git-send-email.perl:1850
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr "не удалось отправить сообщение в 7 битной кодировке"
-#: git-send-email.perl:1858
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr "недопустимая кодировка передачи"
-#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
+#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "не удалось открыть %s: %s\n"
-#: git-send-email.perl:1902
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: патч содержит строку длиннее чем 998 символов"
-#: git-send-email.perl:1919
+#: git-send-email.perl:1947
#, 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:1923
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: "
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.22.0\n"
+"Project-Id-Version: git 2.23.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-05-14 17:09+0800\n"
-"PO-Revision-Date: 2019-05-14 15:44+0100\n"
+"POT-Creation-Date: 2019-07-30 09:59+0800\n"
+"PO-Revision-Date: 2019-07-31 12:40+0200\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.2\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:174
+#: advice.c:180
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."
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
"Observera: checkar ut \"%s\".\n"
"\n"
"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"
"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"
-"i det här läget utan att det påverkar grenar genom att checka ut på\n"
-"nytt.\n"
+"i det här läget utan att det påverkar grenar genom att växla tillbaka\n"
+"till en gren.\n"
"\n"
"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"
-"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n"
-"med -b. Till exempel:\n"
+"du göra det (nu eller senare) genom att använda switch-kommandot med -c.\n"
+"Exempel:\n"
+"\n"
+" git switch -c <namn-på-ny-gren>\n"
"\n"
-" git checkout -b <namn-på-ny-gren>\n"
+"Eller gör den här ändringen ogjord med:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Stäng av den här hjälptexten genom att sätta konfigurationsvariabeln\n"
+"advice.detachedHead till false\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "citat ej stängt"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject och --3way kan inte användas samtidigt."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached och --3way kan inte användas samtidigt."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "ogiltigt läge på rad %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
"\""
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Faller tillbaka på trevägssammanslagning...\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
-msgstr "ogiltig sökväg ”%s”"
+msgstr "ogiltig sökväg \"%s\""
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4549
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "sökväg"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "antal"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
msgid "action"
msgstr "åtgärd"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "rot"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
msgid "not a tree object: %s"
msgstr "inte ett trädobjekt: %s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "aktuell arbetskatalog är inte spårad"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "fmt"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1597
msgid "prefix"
msgstr "prefix"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "fil"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "endast spara"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "arkiv"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "kommando"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
+#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
"kedjan"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter ”%s”."
+msgstr "Det finns redan en gren som heter \"%s\"."
#: branch.c:213
msgid "Cannot force update the current branch."
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: ”%s”."
+msgstr "Avgreningspunkten är inte giltig: \"%s\"."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "kan inte duplicera pakethandtag"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack dog"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "incheckningsgraffilen %s är för liten"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
"ofullständig"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
-#: commit-graph.c:388
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "incheckningsgrafen har inga bas-graf-stycken"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "incheckningsgrafens kedja stämmer inte"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "kan inte hitta alla incheckingsgraffiler"
+
+#: commit-graph.c:553 commit-graph.c:613
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
+
+#: commit-graph.c:574
#, c-format
msgid "could not find commit %s"
msgstr "kunde inte hitta incheckningen %s"
-#: commit-graph.c:730 builtin/pack-objects.c:2649
+#: commit-graph.c:1001 builtin/pack-objects.c:2651
#, c-format
msgid "unable to get type of object %s"
msgstr "kunde inte hämta typ för objektet %s"
-#: commit-graph.c:763
+#: commit-graph.c:1033
msgid "Loading known commits in commit graph"
msgstr "Läser in kända incheckningar i incheckningsgraf"
-#: commit-graph.c:779
+#: commit-graph.c:1050
msgid "Expanding reachable commits in commit graph"
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-#: commit-graph.c:791
+#: commit-graph.c:1069
msgid "Clearing commit marks in commit graph"
msgstr "Rensar incheckningsmärken i incheckningsgraf"
-#: commit-graph.c:811
+#: commit-graph.c:1088
msgid "Computing commit graph generation numbers"
msgstr "Beräknar generationsvärden för incheckningsgraf"
-#: commit-graph.c:928
+#: commit-graph.c:1162
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-#: commit-graph.c:941
+#: commit-graph.c:1175
#, c-format
msgid "error adding pack %s"
msgstr "fel vid tillägg av paketet %s"
-#: commit-graph.c:943
+#: commit-graph.c:1179
#, c-format
msgid "error opening index for %s"
msgstr "fel vid öppning av indexet för %s"
-#: commit-graph.c:957
+#: commit-graph.c:1203
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
-#: commit-graph.c:989
+#: commit-graph.c:1237
msgid "Finding commits for commit graph among packed objects"
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-#: commit-graph.c:1002
+#: commit-graph.c:1252
msgid "Counting distinct commits in commit graph"
msgstr "Räknar olika incheckningar i incheckningsgraf"
-#: commit-graph.c:1015
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
-
-#: commit-graph.c:1024
+#: commit-graph.c:1283
msgid "Finding extra edges in commit graph"
msgstr "Söker ytterligare kanter i incheckingsgraf"
-#: commit-graph.c:1048
-msgid "too many commits to write graph"
-msgstr "för många incheckningar för att skriva graf"
+#: commit-graph.c:1331
+msgid "failed to write correct number of base graph ids"
+msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-#: commit-graph.c:1055 midx.c:805
+#: commit-graph.c:1364 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "kunde inte skapa inledande kataloger för %s"
-#: commit-graph.c:1095
+#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
+#: commit-graph.c:1436
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Skriver ut incheckningsgraf i %d pass"
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
-#: commit-graph.c:1160
+#: commit-graph.c:1477
+msgid "unable to open commit-graph chain file"
+msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
+
+#: commit-graph.c:1489
+msgid "failed to rename base commit-graph file"
+msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
+
+#: commit-graph.c:1509
+msgid "failed to rename temporary commit-graph file"
+msgstr "kunde inte byta namn på temporär incheckningsgraffil"
+
+#: commit-graph.c:1620
+msgid "Scanning merged commits"
+msgstr "Söker sammanslagna incheckningar"
+
+#: commit-graph.c:1631
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "oväntat duplicerat inchecknings-id %s"
+
+#: commit-graph.c:1656
+msgid "Merging commit-graph"
+msgstr "Slår ihop incheckningsgraf"
+
+#: commit-graph.c:1842
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#: commit-graph.c:1853
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+#: commit-graph.c:1943
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
-#: commit-graph.c:1170
+#: commit-graph.c:1953
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-#: commit-graph.c:1180 commit-graph.c:1195
+#: commit-graph.c:1963 commit-graph.c:1978
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
-#: commit-graph.c:1187
+#: commit-graph.c:1970
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-#: commit-graph.c:1204
+#: commit-graph.c:1987
msgid "Verifying commits in commit graph"
msgstr "Bekräftar incheckningar i incheckningsgrafen"
-#: commit-graph.c:1217
+#: commit-graph.c:2000
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
-#: commit-graph.c:1224
+#: commit-graph.c:2007
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
-#: commit-graph.c:1234
+#: commit-graph.c:2017
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
-#: commit-graph.c:1240
+#: commit-graph.c:2026
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "incheckningsgrafens förälder för %s är %s != %s"
-#: commit-graph.c:1253
+#: commit-graph.c:2039
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
-#: commit-graph.c:1258
+#: commit-graph.c:2044
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
"noll på annan plats"
-#: commit-graph.c:1262
+#: commit-graph.c:2048
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
"%s, men noll på annan plats"
-#: commit-graph.c:1277
+#: commit-graph.c:2063
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
-#: commit-graph.c:1283
+#: commit-graph.c:2069
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:348
+#: config.c:375
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:354
+#: config.c:381
#, c-format
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:405 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:384
+#: config.c:411
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:420 config.c:432
+#: config.c:447 config.c:459
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:467
+#: config.c:494
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:793
+#: config.c:820
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:797
+#: config.c:824
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:801
+#: config.c:828
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:805
+#: config.c:832
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:809
+#: config.c:836
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:813
+#: config.c:840
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:952
+#: config.c:977
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:952
+#: config.c:977
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:958
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:963
+#: config.c:997
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:966
+#: config.c:1000
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:969
+#: config.c:1003
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:972
+#: config.c:1006
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:975
+#: config.c:1009
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:978
+#: config.c:1012
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1073
+#: config.c:1107
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1082
+#: config.c:1116
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1173
+#: config.c:1207
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1221 config.c:1232
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1290
+#: config.c:1324
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1323
+#: config.c:1357
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1395
+#: config.c:1429
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1421
+#: config.c:1455
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1422
+#: config.c:1456
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1517 builtin/pack-objects.c:3399
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1604
+#: config.c:1638
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1607
+#: config.c:1641
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1624
+#: config.c:1658
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1654
+#: config.c:1688
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1710
+#: config.c:1744
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2059
+#: config.c:2093
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2229
+#: config.c:2263
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2272
+#: config.c:2306
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
-#: config.c:2298
+#: config.c:2332
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:2344
+#: config.c:2378
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2346
+#: config.c:2380
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2427
+#: config.c:2461
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2459
+#: config.c:2493
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2488
+#: config.c:2522
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2740 config.c:3064
+#: config.c:2774 config.c:3098
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2751
+#: config.c:2785
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2820 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:2811
+#: config.c:2845
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:2824 config.c:3077
+#: config.c:2858 config.c:3111
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2835
+#: config.c:2869
#, c-format
msgid "unable to mmap '%s'"
msgstr "kunde inte utföra mmap på \"%s\""
-#: config.c:2844 config.c:3082
+#: config.c:2878 config.c:3116
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:2929 config.c:3179
+#: config.c:2963 config.c:3213
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:2963
+#: config.c:2997
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2965 builtin/remote.c:782
+#: config.c:2999 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3055
+#: config.c:3089
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3222
+#: config.c:3256
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Markerade %d öar, klar.\n"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "ogiltigt värde för --stat: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216
-#: parse-options.c:200
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s förväntar ett numeriskt värde"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "okänt värde efter ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5240
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5263
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5265 diff.c:5271
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5268 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:182
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5273 diff.c:5387 diff.c:5394
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5274 diff.c:5277
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5279
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5282
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5286
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5290
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5293
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "skriv bara ut den sista raden för --stat"
-#: diff.c:5295 diff.c:5303
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5296
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
-#: diff.c:5300
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5304
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5308
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5311
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-#: diff.c:5314
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5317
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5319
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5320
+#: diff.c:5327
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5322 diff.c:5325 diff.c:5328
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5323
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5326
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5329
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5331
+#: diff.c:5338
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5332
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5335
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5338
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5341
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
-#: diff.c:5343
+#: diff.c:5350
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5344
+#: diff.c:5351
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5345
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5348
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
"eller --numstat"
-#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5352
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5355
-msgid "show the given source prefix instead of \"b/\""
-msgstr "visa givet källprefix istället för \"b/\""
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5358
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "lägg till ytterligare prefix på alla rader i utdata"
-#: diff.c:5361
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5364
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
-#: diff.c:5368 diff.c:5373 diff.c:5378
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5369
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "ange tecken för att ange ny rad istället för \"+\""
-#: diff.c:5374
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "ange tecken för att ange gammal rad istället för \"-\""
-#: diff.c:5379
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "ange tecken för att ange sammanhang istället för \" \""
-#: diff.c:5382
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5383
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5384
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-#: diff.c:5388
+#: diff.c:5395
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5392
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5395
+#: diff.c:5402
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5399
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "använd oförändrade som källa för att hitta kopior"
-#: diff.c:5401
+#: diff.c:5408
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5404
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5406
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-#: diff.c:5409
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5411
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5413
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5416
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5419
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5422
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5425
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5428
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5431
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
-#: diff.c:5434
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "skapa diffar med algoritmen \"patience diff\""
-#: diff.c:5438
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "skapa diffar med algoritmen \"histogram diff\""
-#: diff.c:5440
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<algoritm>"
-#: diff.c:5441
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "välj en diff-algoritm"
-#: diff.c:5443
+#: diff.c:5450
msgid "<text>"
msgstr "<text>"
-#: diff.c:5444
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "skapa diffar med algoritmen \"anchored diff\""
-#: diff.c:5446 diff.c:5455 diff.c:5458
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<läge>"
-#: diff.c:5447
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-#: diff.c:5449 diff.c:5452 diff.c:5497
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5450
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
-#: diff.c:5453
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5456
-msgid "move lines of code are colored differently"
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5459
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5462
-msgid "Diff other options"
+#: diff.c:5469
+msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5464
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
"sökvägar"
-#: diff.c:5468
+#: diff.c:5475
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5470
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5472
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5474
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5476
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5478
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-#: diff.c:5480
+#: diff.c:5487
msgid "<when>"
msgstr "<när>"
-#: diff.c:5481
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5484
+#: diff.c:5491
msgid "<format>"
msgstr "<format>"
-#: diff.c:5485
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5489
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5492
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-#: diff.c:5494
+#: diff.c:5501
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5495
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
-#: diff.c:5498
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5501
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-#: diff.c:5504
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
-#: diff.c:5507
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "styr ordningen i vilken filer visas i utdata"
-#: diff.c:5508
+#: diff.c:5515
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5509
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
-#: diff.c:5511
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5512
+#: diff.c:5519
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5514
+#: diff.c:5521
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5515
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Skriv utdata till en specifik fil"
-#: diff.c:6148
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:6151
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:6154
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
+msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "klart"
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Servern stöder inte klienter med grunda arkiv"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Servern stöder \"multi_ack_detailed\""
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Servern stöder \"no-done\""
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Servern stöder \"multi_ack\""
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Servern stöder \"side-band-64k\""
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Servern stöder \"side-band\""
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Servern stöder \"ofs-delta\""
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Servern stöder filter"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Servern stöder %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Servern stöder inte klienter med grunda arkiv"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Servern stöder filter"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "förväntade bekräftelserad: \"%s\""
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "väntade att paketfil skulle sändas efter \"ready\""
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1699 builtin/clone.c:676
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "okänd kommandolisttyp \"%s\""
#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Fortsätter under förutsättningen att du menade ”%s”."
+msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."
+"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
#: help.c:695
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
msgid "expected 'tree:<depth>'"
msgstr "förväntade \"tree:<djup>\""
-#: list-objects-filter-options.c:156
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:sökväg-filter stöds inte längre"
+
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "felaktig filterspecifikation: \"%s\""
+
+#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
"sammanslagningsbasen)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Snabbspolar undermodulen %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
"hittades inte)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"vilket godtar lösningen.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
"%s lämnad i trädet vid %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Vägrar förlora lortig fil vid \"%s\""
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
"destination fick en majoritet av filerna."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
"%s->%s i %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
"bytt namn."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2937
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2940
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3004
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3004
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3016
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3020
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3043
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3065 git-submodule.sh:937
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3066
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3096
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3178
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
"flyttar den till %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3181
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
"%s, föreslår att den bör flyttas till%s."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3185
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
"namn i %s; flyttar den till %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3188
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
"bytte namn i %s; flyttar den till %s."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3302
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3325
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3330
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3337
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:3338
+#: merge-recursive.c:3346
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3355
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3393
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"sammanslagning:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3404
msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3413
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3512
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3525
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3564
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3630
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "hash-versionen %u stämmer inte"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "felaktigt offset för stycke (för stort)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:209
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:250
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:275
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
-#: midx.c:443
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:449
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:543
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:979
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:1034
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1049
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1053
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Bekräftar OID-ordning i MIDX"
-#: midx.c:1062
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1081
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1087
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1103
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1109
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1118
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "kunde inte starta pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "kunde inte avsluta pack-objects"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "misslyckades skapa lazy_dir-tråd: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "misslyckades skapa lazy_name-tråd: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "misslyckades utföra join på lazy_name-tråd: %s"
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:1880
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: packfile.c:1884
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
msgid "%s : incompatible with something else"
msgstr "%s: inkompatibelt med något annat"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:287
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
msgid "%s takes no value"
msgstr "%s tar inget värde"
msgid "%s isn't available"
msgstr "%s är inte tillgängligt"
-#: parse-options.c:216
+#: parse-options.c:219
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
-#: parse-options.c:356
+#: parse-options.c:389
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
-#: parse-options.c:390 parse-options.c:398
+#: parse-options.c:423 parse-options.c:431
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr "menade du \"--%s\" (med två bindestreck?)"
-#: parse-options.c:733
+#: parse-options.c:859
#, c-format
msgid "unknown option `%s'"
msgstr "okänd flagga \"%s\""
-#: parse-options.c:735
+#: parse-options.c:861
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:737
+#: parse-options.c:863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
-#: parse-options.c:759
+#: parse-options.c:887
msgid "..."
msgstr "..."
-#: parse-options.c:778
+#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:784
+#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:787
+#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:826
+#: parse-options.c:954
msgid "-NUM"
msgstr "-TAL"
-#: parse-options-cb.c:21
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias för --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "flaggan \"%s\" antar ett numeriskt värde"
-#: parse-options-cb.c:38
+#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
-msgstr "trasigt utlöpsdatum: ”%s”"
+msgstr "trasigt utlöpsdatum: \"%s\""
-#: parse-options-cb.c:51
+#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
-#: parse-options-cb.c:127 parse-options-cb.c:144
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”"
+msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
#: pathspec.c:427
#, c-format
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "kunde inte tolka git-huvudet \"%.*s\""
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "kunde inte tolka loggen för \"%s\""
msgstr "osorterade köposter för \"%s\""
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "indexfilen trasig"
msgid "broken index, expect %s in %s, got %s"
msgstr "trasigt index, förväntade %s i %s, fick %s"
-#: read-cache.c:2988 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3091 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3104
+#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3116
+#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: read-cache.c:3141
+#: read-cache.c:3142
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "kan inte rätta behörighetsbitar på \"%s\""
-#: read-cache.c:3290
+#: read-cache.c:3291
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: kan inte återgå till kö 0"
msgstr[0] "Ombasera %s på %s (%d kommando)"
msgstr[1] "Ombasera %s på %s (%d kommandon)"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "kunde inte skriva \"%s\""
"\" (fel).\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "\"%s\" pekar inte på ett giltigt objekt!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorerar dinglande symbolisk referens %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "kunde inte öppna \"%s\" för skrivning: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "Kunde inte läsa referensen \"%s\""
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "referensen \"%s\" finns redan"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "oväntat objekt-id vid skrivning \"%s\""
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "oväntat objekt-id vid borttagning \"%s\""
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "loggen för referensen %s har lucka efter %s"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "loggen för referensen %s slutade oväntat på %s"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "loggen för %s är tom"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
msgid "invalid refspec '%s'"
msgstr "felaktig referensspecifikation: \"%s\""
-#: ref-filter.c:39 wt-status.c:1907
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "försvunnen"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "före %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "bakom %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "okänt %%(objectsize)-argument: %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) tar inte argument"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "positivt värde förväntat objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(ingen gren, ombaserar %s)"
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
-
-#: ref-filter.c:1459
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(ingen gren, \"bisect\" startad på %s)"
+msgid "no branch, rebasing %s"
+msgstr "ingen gren, ombaserar %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
+#: ref-filter.c:1488
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD frånkopplat vid %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD frånkopplat från %s)"
+msgid "no branch, bisect started on %s"
+msgstr "ingen gren, \"bisect\" startad på %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(ingen gren)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "ingen gren"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "flaggan \"%s\" är inkompatibel med --merged"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
msgid "unable to open rr-cache directory"
msgstr "kan inte uppdatera katalogen rr-cache"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "kunde inte ta bort \"%s\""
+
+#: sequencer.c:321
msgid "revert"
msgstr "revert"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "ogiltigt datumformat \"%s\" i \"%s\""
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "skriver rotincheckning"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "kunde inte tolka \"%.*s\""
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "avbryter pågående \"cherry-pick\""
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "avbryter pågående \"revert\""
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr "oanvändbart manus: ”%s”"
+msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr "trasigt manus: ”%s”"
+msgstr "trasigt manus: \"%s\""
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "en \"revert\" pågår redan"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "en \"cherry-pick\" pågår redan"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "ingen \"revers\" pågår"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "ingen \"cherry-pick\" pågår"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "kunde inte hoppa över incheckningen"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "ingenting att hoppa över"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"har du redan checkat in?\n"
+"testa \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:639
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "kunde inte hitta trädet för %s."
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "kunde inte skriva indexet"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "kunde inte checka ut %s"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s: inte ett giltigt OID"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continue\" igen."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
+msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"continue\".\n"
"Avbryt ombaseringen med \"git rebase --abort\".\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
+
+#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:968
msgid "mmap failed"
msgstr "mmap misslyckades"
-#: sha1-file.c:1035
+#: sha1-file.c:1132
#, c-format
msgid "object file %s is empty"
msgstr "objektfilen %s är tom"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1256 sha1-file.c:2395
#, c-format
msgid "corrupt loose object '%s'"
msgstr "trasigt löst objekt \"%s\""
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1258 sha1-file.c:2399
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "skräp i slutet av löst objekt \"%s\""
-#: sha1-file.c:1203
+#: sha1-file.c:1300
msgid "invalid object type"
msgstr "felaktig objekttyp"
-#: sha1-file.c:1287
+#: sha1-file.c:1384
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1290
+#: sha1-file.c:1387
#, c-format
msgid "unable to unpack %s header"
msgstr "kan inte packa upp %s-huvudet"
-#: sha1-file.c:1296
+#: sha1-file.c:1393
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-#: sha1-file.c:1299
+#: sha1-file.c:1396
#, c-format
msgid "unable to parse %s header"
msgstr "kan inte tolka %s-huvud"
-#: sha1-file.c:1490
+#: sha1-file.c:1587
#, c-format
msgid "failed to read object %s"
msgstr "misslyckades läsa objektet %s"
-#: sha1-file.c:1494
+#: sha1-file.c:1591
#, c-format
msgid "replacement %s not found for %s"
msgstr "ersättningen %s hittades inte för %s"
-#: sha1-file.c:1498
+#: sha1-file.c:1595
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "löst objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1502
+#: sha1-file.c:1599
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "packat objekt %s (lagrat i %s) är trasigt"
-#: sha1-file.c:1604
+#: sha1-file.c:1702
#, c-format
msgid "unable to write file %s"
msgstr "kunde inte skriva filen %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1709
#, c-format
msgid "unable to set permission to '%s'"
msgstr "kan inte sätta behörigheten till \"%s\""
-#: sha1-file.c:1618
+#: sha1-file.c:1716
msgid "file write error"
msgstr "fel vid skrivning av fil"
-#: sha1-file.c:1637
+#: sha1-file.c:1735
msgid "error when closing loose object file"
msgstr "fel vid stängning av fil för löst objekt"
-#: sha1-file.c:1702
+#: sha1-file.c:1800
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-#: sha1-file.c:1704
+#: sha1-file.c:1802
msgid "unable to create temporary file"
msgstr "kan inte skapa temporär fil"
-#: sha1-file.c:1728
+#: sha1-file.c:1826
msgid "unable to write loose object file"
msgstr "kunde inte skriva fil för löst objekt"
-#: sha1-file.c:1734
+#: sha1-file.c:1832
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-#: sha1-file.c:1738
+#: sha1-file.c:1836
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1840
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "förvirrad av instabil objektkälldata för %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1850 builtin/pack-objects.c:920
#, c-format
msgid "failed utime() on %s"
msgstr "\"utime()\" misslyckades på %s"
-#: sha1-file.c:1827
+#: sha1-file.c:1925
#, c-format
msgid "cannot read object for %s"
msgstr "kan inte läsa objekt för %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1965
msgid "corrupt commit"
msgstr "trasik incheckning"
-#: sha1-file.c:1875
+#: sha1-file.c:1973
msgid "corrupt tag"
msgstr "trasig tagg"
-#: sha1-file.c:1974
+#: sha1-file.c:2072
#, c-format
msgid "read error while indexing %s"
msgstr "läsfel vid indexering av %s"
-#: sha1-file.c:1977
+#: sha1-file.c:2075
#, c-format
msgid "short read while indexing %s"
msgstr "för lite lästes vid indexering av %s"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2148 sha1-file.c:2157
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: misslyckades lägga in i databasen"
-#: sha1-file.c:2065
+#: sha1-file.c:2163
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: sha1-file.c:2089
+#: sha1-file.c:2187
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
-#: sha1-file.c:2091
+#: sha1-file.c:2189
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2216 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kan inte öppna %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2406 sha1-file.c:2458
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash stämmer inte för %s (förväntade %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2430
#, c-format
msgid "unable to mmap %s"
msgstr "kan inte utföra \"mmap\" för %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2435
#, c-format
msgid "unable to unpack header of %s"
msgstr "kan inte packa upp huvud för %s"
-#: sha1-file.c:2343
+#: sha1-file.c:2441
#, c-format
msgid "unable to parse header of %s"
msgstr "kan inte tolka huvud för %s"
-#: sha1-file.c:2354
+#: sha1-file.c:2452
#, c-format
msgid "unable to unpack contents of %s"
msgstr "kan inte tolka innehåll i %s"
-#: sha1-name.c:487
+#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1-name.c:498
+#: sha1-name.c:501
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1-name.c:794
+#: sha1-name.c:800
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
"referenser kan skapas av misstag. Till exempel, för\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u,%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u,%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u,%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u,%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u,%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u,%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
msgid "Submodule '%s' could not be updated."
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: ”%s”"
+msgstr "transport: ogiltig flagga för depth: \"%s\""
#: transport.c:259
msgid "see protocol.version in 'git help config' for more details"
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "komplett skrivning till fjärrhjälpare misslyckades"
msgid "error while running fast-import"
msgstr "fel när fast-import kördes"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "kunde inte läsa referensen %s"
msgid "helper %s does not support 'push-option'"
msgstr "hjälparen %s stöder inte \"push-option\""
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "hjälparen %s stöder inte \"force\""
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "kunde inte köra fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "fel vid körning av fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Inga gemensamma referenser och inga angavs; gör inget.\n"
"Du kanske borde ange en gren såsom \"master\".\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "felformat svar i referenslistan: %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "läs(%s) misslyckades"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "skriv(%s) misslyckades"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "%s-tråden misslyckades"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s-tråden misslyckades ansluta: %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "kan inte starta tråd för kopiering av data: %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "processen %s misslyckades vänta"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "processen %s misslyckades"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "kan inte skapa tråd för kopiering av data"
msgid "empty filename in tree entry"
msgstr "tomt filnamn i trädpost"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "trädfil för kort"
msgstr "Avbryter\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Checkar ut filer"
+msgid "Updating files"
+msgstr "Uppdaterar filer"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (använd \"git restore --staged <fil>...\" för att ta bort från kö)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från "
+"kö)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
+" (använd \"git restore <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:896
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Stashen innehåller just nu %d post"
msgstr[1] "Stashen innehåller just nu %d poster"
-#: wt-status.c:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
+"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1282
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1284
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1287
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1298
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1303
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1306
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1314
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1326
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1331
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1344
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1346
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1348
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1355
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1359
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1364
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1367
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1371
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1376
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1379
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1381
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1392
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick pågår."
-#: wt-status.c:1395
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1402
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1405
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"
-#: wt-status.c:1408
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1410
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1420
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Ångring pågår."
-#: wt-status.c:1423
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1429
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1432
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (kör \"git revert --continue\" för att fortsätta)"
-#: wt-status.c:1435
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1447
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1451
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1454
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1663
+#: wt-status.c:1690
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1670
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1672
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1677
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
-
-#: wt-status.c:1679
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
-
-#: wt-status.c:1682
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1699
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1700
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1714
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1716
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1720
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1726
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1728
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1734
+#: wt-status.c:1761
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1739
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1742
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1745
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1748
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1751
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1754 wt-status.c:1759
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1757
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1761
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1874
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1878
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1909
+#: wt-status.c:1936
msgid "different"
msgstr "olika"
-#: wt-status.c:1911 wt-status.c:1919
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "efter "
-#: wt-status.c:1914 wt-status.c:1917
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2441
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2447
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2449
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "testkörning"
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
"\n"
"\tgit rm --cached %s\n"
"\n"
-"Se ”git help submodule” för ytterligare information."
+"Se \"git help submodule\" för ytterligare information."
#: builtin/add.c:354
#, c-format
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:949 builtin/clone.c:412
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"Du har fortfarande ej sammanslagna sökvägar i indexet.\n"
-"Du bör köra ”git add” på filer med lösta konflikter för att ange dem som "
+"Du bör köra \"git add\" på filer med lösta konflikter för att ange dem som "
"lösta.\n"
-"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
+"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
-msgstr "Kan inte tolka objektet ”%s”."
+msgstr "Kan inte tolka objektet \"%s\"."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:307 builtin/stash.c:806
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:397
-#: parse-options.h:140 parse-options.h:161 parse-options.h:303
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "avbryt patchningen men behåll HEAD där det är."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "visa patchen som tillämpas."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "interaktivt läge kräver patchar på kommandoraden"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<flaggor>] [<patch>...]"
#: builtin/bisect--helper.c:526
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "misslyckades checka ut ”%s”. Försök ”git bisect reset <giltig_gren>”."
+msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
# cogito-relaterat
#: builtin/bisect--helper.c:547
msgid "bad HEAD - strange symbolic ref"
msgstr "felaktigt HEAD - konstig symbolisk referens"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "ogiltig referens: \"%s\""
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "utför 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "skriv termerna i .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "städar upp bisect-tillstånd"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "kontrollera för förväntade versioner"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "återställ bisect-tillstånd"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "skriver bisect-tillståndet i BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "visa och ange termer för bisect-tillstånd"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "se efter om termer för rätt och fel finns"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "skriv ut termer för bisect"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "påbörja bisect-körningen"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "ingen logg för BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms kräver två argument"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state tar inga argument"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write kräver antingen 4 eller 5 argument"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms kräver tre argument"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check kräver 2 eller 3 argument"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms kräver noll eller ett argument"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "förväntade en färg: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "måste sluta med en färg"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "ogiltigt värde för blame.coloring"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "kan inte hitta revision %s att ignorera"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1646
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "ignorera <rev> vid klandren"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "ignorera revisioner från <fil>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "färglägg redundant metadata från tidigare rader annorlunda"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "färglägg rader efter ålder"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Använd en experimentell algoritm för att förbättra diffar"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Klandra rader"
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "kunde inte slå upp HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pekar utenför refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Ta bort uppströmsinformationen"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "visa namn på aktuell gren"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:676 builtin/clone.c:751
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "för många flaggor för att byta uppström"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
-"grennamn"
+"Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
+"Menade du att använda: -a|-r --list <mönster>?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "endast en buntflagga kan anges"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör filter på objektets innehåll"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "ordna inte --batch-all-objects output"
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgstr "skriv innehåll till temporära filer"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "sträng"
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<flaggor>] <gren>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<flaggor>] [<gren>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Återskapade %d sammanslagningskonflikt"
+msgstr[1] "Återskapade %d sammanslagningskonflikter"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Uppdaterade %d sökväg från %s"
+msgstr[1] "Uppdaterade %d sökvägar från %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Uppdaterade %d sökväg från indexet"
+msgstr[1] "Uppdaterade %d sökvägar från indexet"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "sökvägen \"%s\" har inte slagits ihop"
+msgid "neither '%s' or '%s' is specified"
+msgstr "varken \"%s\" eller \"%s\" har angivits"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Återskapade %d sammanslagningskonflikt"
-msgstr[1] "Återskapade %d sammanslagningskonflikter"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "\"%s\" måste användas när \"%s\" inte anges"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "Uppdaterade %d sökväg från %s"
-msgstr[1] "Uppdaterade %d sökvägar från %s"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "Uppdaterade %d sökväg från indexet"
-msgstr[1] "Uppdaterade %d sökvägar från indexet"
+msgid "path '%s' is unmerged"
+msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr "köade ändringar i följande filer kan gå förlorade: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:894 builtin/clone.c:704
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "endast en referens förväntades"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "förväntade gren, fick taggen \"%s\""
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "förväntade gren, fick fjärrgrenen \"%s\""
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "förväntade gren, fick \"%s\""
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "förväntade gren, fick incheckningen \"%s\""
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren vid sammanslagning\n"
+"Överväg \"git merge --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren mitt i en \"am\"-körning\n"
+"Överväg \"git am --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren vid ombasering\n"
+"Överväg \"git rebase --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren i en \"cherry-pick\"\n"
+"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"kan inte växla gren i en \"revert\"\n"
+"Överväg \"git revert --quit\" eller \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "då växlar grenar medan du gör en \"bisect\""
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "\"%s\" kan inte ta <startpunkt>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:121
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "gren"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "skapa och checka ut en ny gren"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "skapa/nollställ och checka ut en gren"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "skapa reflogg för ny gren"
+#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+msgid "style"
+msgstr "stil"
+
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1366
-msgid "checkout our version for unmerged files"
-msgstr "checka ut vår version för ej sammanslagna filer"
-
-#: builtin/checkout.c:1369
-msgid "checkout their version for unmerged files"
-msgstr "checka ut deras version för ej sammanslagna filer"
-
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "utför en 3-vägssammanslagning för den nya grenen"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
+#: builtin/checkout.c:1459 builtin/merge.c:288
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:309
-msgid "style"
-msgstr "stil"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "konfliktstil (merge eller diff3)"
-
-#: builtin/checkout.c:1381
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "begränsa inte sökvägar till endast glesa poster"
-
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "försök inte vara förutspå \"git checkout <gren-saknas>\""
-
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1462
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "tvinga förloppsrapportering"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
+msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "använd överläggsläge (standard)"
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
+msgstr "checka ut deras version för ej sammanslagna filer"
+
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p och --overlay är ömsesidigt uteslutande"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "grennamn saknas; försök med -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "kunde inte upplösa %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "du måste ange katalog(er) att återställa"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den"
+msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
"checkout.defaultRemote=origin i din konfiguration."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "gren"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "skapa och checka ut en ny gren"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "skapa/nollställ och checka ut en gren"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "skapa reflogg för ny gren"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "använd överläggsläge (standard)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "skapa och växla till en ny gren"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "skapa/nollställ och växla till en gren"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "förutspå \"git checkout <gren-saknas>\""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "kasta bort lokala ändringar"
+
+#: builtin/checkout.c:1772
+msgid "where the checkout from"
+msgstr "källa till utcheckning"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "återställ indexet"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "återställ arbetskatalogen (förval)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "ignorera ej sammanslagna poster"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "använd överläggsläge"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "kunde inte ta status (\"lstat\") på %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
-#: builtin/show-ref.c:178
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:103 builtin/clone.c:107
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:103 builtin/clone.c:107
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/pack-objects.c:3308 builtin/repack.c:330
msgid "name"
msgstr "namn"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:125 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "djup"
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:127 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
msgid "time"
msgstr "tid"
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:129 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:130 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/clone.c:142 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/clone.c:143 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:145 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:283
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:336
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:408
-#, c-format
-msgid "failed to open '%s'"
-msgstr "misslyckades öppna \"%s\""
-
-#: builtin/clone.c:416
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:430
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "misslyckades ta status på %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:447
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
-#: builtin/clone.c:452
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:456
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:482
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "misslyckades iterera över \"%s\""
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:496
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Klonen lyckades, men utcheckningen misslyckades.\n"
"Du kan inspektera det som checkades ut med \"git status\"\n"
-"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
+"och försöka med \"git restore -source=HEAD :/\"\n"
-#: builtin/clone.c:573
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:692
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:742
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:773
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:818
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:881
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:883
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:923 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:927
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:940
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:943
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:956
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:962 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1653
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:972
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:982
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:997 builtin/clone.c:1018 builtin/difftool.c:270
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:1002
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1022
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1024
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1048
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1109
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1111
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1113
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1118
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1123
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1200 builtin/clone.c:1208
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1211
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
msgid "duplicate parent %s ignored"
msgstr "duplicerad förälder %s ignorerades"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
msgid "id of a parent commit object"
msgstr "id på ett förälderincheckningsobjekt"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "incheckningsmeddelande"
msgid "read commit log message from file"
msgstr "läs incheckningsloggmeddelande från fil"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Använd annars \"git reset\"\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Använd annars \"git cherry-pick --skip\"\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"Om du vill hoppa över incheckningen, använd:\n"
+"och sedan:\n"
+"\n"
+" git cherry-pick --continue\n"
"\n"
-" git reset\n"
+"för att fortsätta \"cherry-pick\" med resterande incheckningar.\n"
+"Om du vill hoppa över den här incheckningen, använd:\n"
+"\n"
+" git cherry-pick --skip\n"
"\n"
-"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
-"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "beräkna fullständiga före-/efter-värden"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "version"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:323
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1342 parse-options.h:178
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "när"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:315 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"arkivet har uppdaterats, men kunde inte skriva filen\n"
"new_index. Kontrollera att disken inte är full och\n"
"att kvoten inte har överskridits, och kör sedan\n"
-"\"git reset HEAD\" för att återställa."
+"\"git restore --staged :/\" för att återställa."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objkat>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objkat>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objkat>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objkat>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1601
msgid "dir"
msgstr "kat"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Objektkatalogen där grafen skall lagras"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "starta traversering vid alla referenser"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "sök paketindex listade på standard in efter incheckningar"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "börja gå genom incheckningar listade på standard in"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "ta med alla incheckningar redan i filen commit-graph"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "tillåt skriva en inkrementell incheckningsgraffil"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "okänt argument för --type, %s"
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "värdet har givits denna typ"
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "värde"
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
-#: builtin/difftool.c:31
+#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:259
+#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:311
+#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:412
+#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:695
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:697
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:704
+#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"
+msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:711
+#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:714
+#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
msgid "passed to `diff`"
msgstr "sändes till \"diff\""
-#: builtin/difftool.c:730
+#: builtin/difftool.c:724
msgid "difftool requires worktree or --no-index"
msgstr "difftool kräver en arbetskatalog eller --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff är inkompatibelt med --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:751
+#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "typ"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "standard för git_env_*(...) att falla tillbaka på"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "var tyst, använd bara git_env_*() som resultatvärde"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte "
+"\"%s\""
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"flaggan \"--default\" förväntar ett teckenlöst långt värde med \"--type=ulong"
+"\", inte \"%s\""
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
-msgstr "Dump märken till filen"
+msgstr "Dumpa märken till filen"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1649
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "kör \"gc --auto\" efter hämtning"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:879
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:900
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:991 builtin/fetch.c:1124
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1002
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1008
+msgid ""
+"Fetch normally indicates which branches had a forced update, but that check "
+"has been disabled."
+msgstr ""
+"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men "
+"det testet har slagits av."
+
+#: builtin/fetch.c:1009
+msgid ""
+"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
+"showForcedUpdates true'."
+msgstr ""
+"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör "
+"\"git config fetch.showForcedUpdates true\"."
+
+#: builtin/fetch.c:1011
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
+"updates'\n"
+msgstr ""
+"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda "
+"\"--no-show-forced-updates\"\n"
+
+#: builtin/fetch.c:1013
+msgid ""
+"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+msgstr ""
+"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n"
+
+#: builtin/fetch.c:1094
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1095
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1127
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1128 builtin/remote.c:1036
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1151
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1170
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1173
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1477
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1479 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1525
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialClone"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1549
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1586
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1637
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1639
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1644
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1646
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1662
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1664
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1673
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1680
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1696
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "använd formatfärger"
msgid "Checking %s link"
msgstr "Kontrollerar %s-länk"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Kontrollerar objekt"
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2722
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3405
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "flaggan stöds inte med --recurse-submodules"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached och --untracked kan inte användas med --no-index"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "typ"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "objekttyp"
#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "okänt hjälpformat: ”%s”"
+msgstr "okänt hjälpformat: \"%s\""
#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "felaktig alias.%s-sträng: %s"
msgid "'git help config' for more information"
msgstr "\"git help config\" för mer information"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:600
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
+#: builtin/index-pack.c:738 builtin/pack-objects.c:153
#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "fsck-fel i packat objekt"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "kan inte ta skriva %s-fil \"%s\""
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "kan inte stänga skriven %s-fil \"%s\""
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "fsck-fel i packat objekt"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbol>[(=|:)<värde>])...] [<fil>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "redigera filer på plats"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "ta bort tomma släprader"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "var nya släprader skall placeras"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "att göra om släprader redan finns"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "att göra om släprader saknas"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "visa endast släprader"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "använd inte regler från konfigurationen"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "slå ihop värden avdelade med blanksteg"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "välj tolkningsalternativ"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "tolka inte --- speciellt"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "släprad"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "släprad(er) att lägga till"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer med --only-input ger ingen mening"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:168
+#: builtin/log.c:160
+msgid ""
+"log.mailmap is not set; its implicit value will change in an\n"
+"upcoming release. To squelch this message and preserve current\n"
+"behaviour, set the log.mailmap configuration value to false.\n"
+"\n"
+"To squelch this message and adopt the new behaviour now, set the\n"
+"log.mailmap configuration value to true.\n"
+"\n"
+"See 'git help config' and search for 'log.mailmap' for further information."
+msgstr ""
+"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
+"version. För att dölja det här meddelandet och behålla nuvarande\n"
+"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
+"\n"
+"För att dölja det här meddelandet och använda det nya beteendet,\n"
+"sätt konfigurationsvariabeln log.mailmap till true.\n"
+"\n"
+"Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
+
+#: builtin/log.c:183
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:169
+#: builtin/log.c:184
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:171
+#: builtin/log.c:186
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:173
+#: builtin/log.c:188
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:174
+#: builtin/log.c:189
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:177
+#: builtin/log.c:192
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:275
+#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:551
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:566 builtin/log.c:660
#, c-format
msgid "could not read object %s"
msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:663
+#: builtin/log.c:685
#, c-format
msgid "unknown type: %d"
msgstr "okänd typ: %d"
-#: builtin/log.c:784
+#: builtin/log.c:808
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:885
+#: builtin/log.c:925
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:901
+#: builtin/log.c:941
#, c-format
msgid "cannot open patch file %s"
msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:918
+#: builtin/log.c:958
msgid "need exactly one range"
msgstr "behöver precis ett intervall"
-#: builtin/log.c:928
+#: builtin/log.c:968
msgid "not a range"
msgstr "inte ett intervall"
-#: builtin/log.c:1051
+#: builtin/log.c:1091
msgid "cover letter needs email format"
msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1057
+#: builtin/log.c:1097
msgid "failed to create cover-letter file"
msgstr "misslyckades skapa fil för omslagsbrev"
-#: builtin/log.c:1136
+#: builtin/log.c:1176
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1203
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1261
msgid "two output directories?"
msgstr "två utdatakataloger?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
#, c-format
msgid "unknown commit %s"
msgstr "okänd incheckning %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-#: builtin/log.c:1347
+#: builtin/log.c:1387
msgid "could not find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1351
+#: builtin/log.c:1391
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"
"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
-#: builtin/log.c:1371
+#: builtin/log.c:1411
msgid "failed to find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1382
+#: builtin/log.c:1422
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1386
+#: builtin/log.c:1426
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1439
+#: builtin/log.c:1479
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1491
+#: builtin/log.c:1531
msgid "failed to infer range-diff ranges"
msgstr "misslyckades räkna ut intervall range-diff"
-#: builtin/log.c:1536
+#: builtin/log.c:1576
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1539
+#: builtin/log.c:1579
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1543
+#: builtin/log.c:1583
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1545
+#: builtin/log.c:1585
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1547
+#: builtin/log.c:1587
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1548
+#: builtin/log.c:1588
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1549
+#: builtin/log.c:1589
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1551
+#: builtin/log.c:1591
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1593
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1555
+#: builtin/log.c:1595
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1598
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1601
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1564
+#: builtin/log.c:1604
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1607
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1569
+#: builtin/log.c:1609
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1571
+#: builtin/log.c:1611
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1573
+#: builtin/log.c:1613
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1575
+#: builtin/log.c:1615
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1576
+#: builtin/log.c:1616
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1577
+#: builtin/log.c:1617
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1618 builtin/log.c:1620
msgid "email"
msgstr "epost"
-#: builtin/log.c:1578
+#: builtin/log.c:1618
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1580
+#: builtin/log.c:1620
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1582
+#: builtin/log.c:1622
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1583
+#: builtin/log.c:1623
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1585
+#: builtin/log.c:1625
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1586
+#: builtin/log.c:1626
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1627 builtin/log.c:1630
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1588
+#: builtin/log.c:1628
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1591
+#: builtin/log.c:1631
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1595
+#: builtin/log.c:1635
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1597
+#: builtin/log.c:1637
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1598
+#: builtin/log.c:1638
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1599
+#: builtin/log.c:1639
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1600
+#: builtin/log.c:1640
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1602
+#: builtin/log.c:1642
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1603
+#: builtin/log.c:1643
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1605
+#: builtin/log.c:1645
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1647
msgid "show changes against <rev> in cover letter or single patch"
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1610
+#: builtin/log.c:1650
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1612
+#: builtin/log.c:1652
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1687
+#: builtin/log.c:1727
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1742
msgid "-n and -k are mutually exclusive"
msgstr "-n och -k kan inte användas samtidigt"
-#: builtin/log.c:1704
+#: builtin/log.c:1744
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-#: builtin/log.c:1712
+#: builtin/log.c:1752
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1714
+#: builtin/log.c:1754
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1716
+#: builtin/log.c:1756
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1748
+#: builtin/log.c:1788
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1837
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1841
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1842
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor kräver --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1860
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:1861
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1908
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:1952
+#: builtin/log.c:1992
msgid "failed to create output files"
msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:2011
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exec"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
-msgstr "tom mbox: ”%s”"
+msgstr "tom mbox: \"%s\""
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort men lämna index och arbetskatalog ensamma"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "bekräfta commit-msg-krok"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"temagren.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit tar inga argument"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Du kan inte kombinera --squash med --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Redan à jour."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
-msgstr "kunde inte bestämma referensen ”%s”"
+msgstr "kunde inte bestämma referensen \"%s\""
#: builtin/merge-recursive.c:78
#, c-format
msgstr "tillåt skapa mer än ett träd"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<kat>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --"
+"batch-size=<storlek>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
+"storlekt"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "för många argument"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "okänt verb: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "okänt underkommando: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "ignorera referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1591
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "deltabasoffset utanför gränsen i pack för %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1600
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "deltabasoffset utanför gränsvärden för %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1869
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:1999
#, c-format
msgid "unable to get size of %s"
msgstr "kan inte hämta storlek på %s"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2014
#, c-format
msgid "unable to parse object header of %s"
msgstr "kunde inte tolka objekthuvud för %s"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
+#: builtin/pack-objects.c:2110
#, c-format
msgid "object %s cannot be read"
msgstr "objektet %s kunde inte läsas"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2124
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2450
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Deltakomprimering använder upp till %d trådar"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2582
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "kan inte packa objekt nåbara från taggen %s"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2669
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2675
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2756
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2860
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
msgid "cannot open pack index"
-msgstr "kan inte öppna paketfilen"
+msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2950
#, c-format
msgid "loose object at %s could not be examined"
msgstr "lösa objekt på %s kunde inte underökas"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3035
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3127
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3130
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3155
msgid "unable to add recent objects"
-msgstr "kan inte lägga till nya objekt"
+msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3208
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3212
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3242
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3244
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3246
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3249
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3250
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3251
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3254
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3256
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3258
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3260
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3262
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3264
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3266
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3268
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3270
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3272
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3274
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3276
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3278
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till dem som ännu inte packats"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3281
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3284
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3287
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3290
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3292
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3294
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3296
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3298
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3301
msgid "use the sparse reachability algorithm"
msgstr "använd gles-nåbarhetsalgoritmen"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3303
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3305
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3307
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3309
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3311
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3313
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3315
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3317
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3320
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3323
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3325
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3350
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3355
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3409
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kan inte användas för att bygga ett paket som skall överföras"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3411
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3416
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3419
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3425
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3486
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3516
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:7
+#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<flaggor>]"
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "packa allt"
-#: builtin/pack-refs.c:16
+#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
msgid "keep empty commits"
msgstr "behåll tomma incheckningar"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
msgid "sign commits"
msgstr "signera incheckningar"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "vis diffstat för vad som ändrats uppströms"
msgid "the command to run"
msgstr "kommando att köra"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s kräver en interaktiv ombasering"
msgid "Cannot store %s"
msgstr "Kan inte spara %s"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "kunde inte bestämma HEAD-revision"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "exec-kommandon kan inte innehålla nyradstecken"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "tomt exec-kommando"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "ombasera mot given grenen istället för uppström"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "sänds till \"git am\""
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "avbryt men behåll HEAD där det är"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "visa patchen som tillämpas eller slås samman"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för sammanslagning"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "låt användaren redigera listan över incheckningar att ombasera"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "behåll tomma incheckningar under ombasering"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "utför automatiskt stash/stash pop före och efter"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"stödet för rebase.useBuiltin har tagits bort!\n"
"Se posten för det i \"git help config\" för detaljer."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "kunde inte ta bort \"%s\""
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"kan inte kombinera am-flaggor med varken interaktiv- eller "
"sammanslagningsflaggor"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
"\""
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\""
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
-msgstr "felaktig uppström ”%s”"
+msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Pekar inte på en giltig incheckning: \"%s\""
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Kunde inte bestämma HEAD:s incheckning"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Oväntat svar från stash: \"%s\""
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Kunde inte skapa katalog för \"%s\""
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Skapade autostash: %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "kunde inte utföra \"reset --hard\""
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "kunde inte växla till %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktuell gren %s är à jour.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Snabbspolade %s till %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:200
+#: builtin/repack.c:201
msgid "could not start pack-objects to repack promisor objects"
msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:240 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects."
-#: builtin/repack.c:256
+#: builtin/repack.c:257
msgid "could not finish pack-objects to repack promisor objects"
msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:294
+#: builtin/repack.c:295
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:296
+#: builtin/repack.c:297
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:299
+#: builtin/repack.c:300
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:302
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:306
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:312
+#: builtin/repack.c:313
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:314
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:320 builtin/repack.c:326
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:322
+#: builtin/repack.c:323
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:324
+#: builtin/repack.c:325
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:326
+#: builtin/repack.c:327
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:328
+#: builtin/repack.c:329
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:331
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:340
+#: builtin/repack.c:341
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:344
+#: builtin/repack.c:345
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:423
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:484
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"VARNING: namnet misslyckades också.\n"
"VARNING: Byt namn på dem i %s manuellt:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "objektfiltrering kräver --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "ogiltigt värde för sparse: \"%s\""
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
msgid "cancel revert or cherry-pick sequence"
msgstr "avbryt revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "hoppa över nuvarande incheckning och fortsätt"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "checka inte in automatiskt"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "redigera incheckningsmeddelandet"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "nummer-på-förälder"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "välj förälder för huvudlinje"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "inga motsvarande referenser med %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "visa referenser som inte kan nås från någon annan referens"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
"base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog behöver ett namn på en gren"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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] "maximalt %d poster kan visas samtidigt."
msgstr[1] "maximalt %d poster kan visas samtidigt."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
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] [--] [<mönster>...]"
-#: builtin/show-ref.c:12
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<mönster>]"
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "visa endast taggar (kan kombineras med huvuden)"
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "visa endast huvuden (kan kombineras med taggar)"
-#: builtin/show-ref.c:163
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
-#: builtin/show-ref.c:166 builtin/show-ref.c:168
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "avreferera taggar till objekt-id"
-#: builtin/show-ref.c:172
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "visa SHA1-hash endast med <n> siffror"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "visa inte resultat på standard ut (användbart med --verify)"
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
#: builtin/stash.c:161 git-legacy-stash.sh:548
msgid "No stash entries found."
-msgstr "Inga ”stash”-poster hittades."
+msgstr "Inga \"stash\"-poster hittades."
#: builtin/stash.c:175
#, c-format
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Glömde du använda \"git add\"?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Sparade arbetskatalogen och indexstatus %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "ta med ignorerade filer"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "kunde inte köra %s"
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
"run_command returnerade icke-nollstatus för %s\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"undermoduler för %s\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Dölj utdata från för varje undermodulskommando som startas"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
"officiella uppström."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "misslyckades rekursera in i undermodulen \"%s\""
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Hindra statusutskrift för undermodul"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "rekursera in i nästlade undermoduler"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Dölj utdata från synkroniering av undermodul-url"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
"\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "kunde inte skapa tom undermodulskatalog %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”"
+msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "se till att .gitmodules finns i arbetskatalogen"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
-"You have created a nested tag. The object referred to by your new is\n"
+"You have created a nested tag. The object referred to by your new tag is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-"Du har skapat en nästlad tagg. Objektet som refereras av din nya är\n"
+"Du har skapat en nästlad tagg. Objektet som refereras av din nya tagg är\n"
"redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <incheckning>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:69
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "visa råa gpg-statusdata"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "misslyckades ta bort \"%s\""
"använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för "
"att rensa"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "målet \"%s\" finns redan"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"kan inte flytta en låst arbetskatalog;\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "\"%s\" är smutsigt, använd --force för att ta bort det"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"kan inte ta bort en låst arbetskatalog;\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
-"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
+"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
+"See \"git help git\" för en översikt över systemet."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "ingen katalog angavs för --git-dir\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "ingen katalog angavs för --work-tree\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "inget prefix angavs för --super-prefix\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c förväntar en konfigurationssträng\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "ingen katalog angavs för -C\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "okänd flagga: %s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "vid expandering av aliaset \"%s\": \"%s\""
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"aliaset \"%s\" ändrar miljövariabler.\n"
"Du kan använda \"!git\" i aliaset för att göra det"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "tomt alias för %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "rekursivt alias: %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "skrivfel på standard ut"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "okänt skrivfel på standard ut"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:797
+#: git.c:796
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
-#: git.c:847
+#: git.c:846
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:860
+#: git.c:859
#, c-format
msgid ""
"usage: %s\n"
"användning: %s\n"
"\n"
-#: git.c:880
+#: git.c:879
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
-#: git.c:892
+#: git.c:891
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "misslyckades köra kommandot \"%s\": %s\n"
#: remote-curl.c:1120 remote-curl.c:1126
#, c-format
-msgid "protocol error: expected sha/ref, got %s'"
+msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
#: remote-curl.c:1138 remote-curl.c:1252
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
-#: list-objects-filter-options.h:63
+#: list-objects-filter-options.h:61
msgid "args"
msgstr "argument"
-#: list-objects-filter-options.h:64
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "objektfiltrering"
-#: parse-options.h:169
+#: parse-options.h:170
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:183
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:296
+#: parse-options.h:305
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:298
+#: parse-options.h:307
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:304
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
-#: parse-options.h:323
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
+#: wt-status.h:68
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
+
+#: wt-status.h:69
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Lägg filinnehåll till indexet"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr ""
-"Visa innehåller eller typ- och storleksinformation för objekt i arkivet."
+"Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
#: command-list.h:61
msgid "Display gitattributes information"
msgstr "Återställ aktuell HEAD till angivet tillstånd"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Återställ filer i arbetskatalogen"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Återställ några befintliga incheckningar"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Plocka ut och massera parametrar"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Sänd en uppsättning patchar som e-post"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Sänd objekt över Git-protokollet till annat arkiv"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Summera \"git log\"-utdata"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Visa grenar och deras incheckningar"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Skapa packat arkivindex"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Visa referenser i ett lokalt arkiv"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Git:s i18n-startkod för skalskript"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Gemensam skriptstartkod för Git"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Spara undan ändringar i en lortig arbetskatalog"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Lägg filinnehållet till indexet"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Ta bort onödiga blanksteg"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Initiera, uppdatera eller inspektera undermoduler"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Byt gren"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Läs, modifiera eller ta bort symbolisk referens"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Skapar temporära filer med innehållet från en blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Packa upp objekt från ett pakat arkiv"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Sänd arkivet tillbaka till git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Visa en logisk Git-variabel"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Kontrollera GPG-signaturer för incheckningar"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Bekräfta packade Git-arkivfiler"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Kontrollera GPG-signaturer i taggar"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Skapa ett trädobjekt från aktuellt index"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git för CVS-användare"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "En Git-ordlista"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git-namnrymder"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Gits arkivlayout"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Introduktion till Git: del två"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Introduktion till Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
msgid "See git-${cmd}(1) for details."
msgstr "Se git-${cmd}(1) för detaljer."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Tillämpade autostash."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Kan inte spara $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Ombaserar ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"\n"
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: inte en incheckning som kan väljas"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Felaktigt incheckningsnamn: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Snabbspolade till $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Kan inte snabbspola till $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Kan inte flytta HEAD till $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Kunde inte välja $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Det här är incheckningsmeddelande ${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Det här är en kombination av $count incheckning."
msgstr[1] "Det här är en kombination av $count incheckningar."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kan inte skriva $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Det här är en kombination av 2 incheckningar."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Kunde inte tillämpa $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Stoppade på $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Kör: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Körning misslyckades: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Okänt kommando: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Rätta det med \"git rebase --edit-todo\"."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Lyckades ombasera och uppdatera $head_name."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continue\" igen."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "köad"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "ej köad"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "binär"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "ingenting"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "oändrad"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Uppdatera"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Återställ"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"Rader som börjar med %s kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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"
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - applicera stycket på arbetskatalogen\n"
+"n - applicera inte stycket på arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"a - applicera stycket och alla följande i filen\n"
+"d - applicera inte stycket eller något av de följande i filen"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "Inga andra stycken att gå till\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "Inga andra stycken att söka efter\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "Beklagar, kan inte dela stycket\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "Beklagar, kan inte redigera stycket\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Granska diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
"eller konfigurationsflagga)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"ödesdigert: %s: %s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem skall breven sändas (om någon)?"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %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:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Servern stöder \"multi_ack_detailed\""
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Servern stöder \"no-done\""
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Servern stöder \"multi_ack\""
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Servern stöder \"side-band-64k\""
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Servern stöder \"side-band\""
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Servern stöder \"allow-tip-sha1-in-want\""
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Servern stöder \"ofs-delta\""
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD frånkopplat vid %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD frånkopplat från %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Checkar ut filer"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "misslyckades öppna \"%s\""
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "misslyckades ta status på %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Om du vill hoppa över incheckningen, använd:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
+#~ "cherry-pick för återstående incheckningar.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "okänt verb: %s"
+
#~ msgid "hash version %X does not match version %X"
#~ msgstr "hash-versionen %X stämmer inte med versionen %X"
#~ msgstr ""
#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#~ msgid "--reschedule-failed-exec requires an interactive rebase"
-#~ msgstr "--reschedule-failed-exec kräver en interaktiv ombasering"
-
#~ msgid "ignoring unknown color-moved-ws mode '%s'"
#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\""
#~ msgid "cannot remove a locked working tree"
#~ msgstr "kan inte ta bort en låst arbetskatalog"
-#~ msgid "Applied autostash."
-#~ msgstr "Tillämpade autostash."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Kan inte spara $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.22.0 round 3\n"
+"Project-Id-Version: git v2.23.0-rc2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-04 08:07+0700\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-11 07:08+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"
"X-Poedit-Basepath: ..\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sgợi ý: %.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được hòa "
-"trộn."
+"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
+"hòa trộn."
-#: advice.c:174
+#: advice.c:180
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."
"Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"Chú ý: đang lấy ra “%s”.\n"
+"Chú ý: đang chuyển sang “%s”.\n"
"\n"
"Bạn đang ở tình trạng “detached HEAD”. Bạn có thể xem qua, tạo các thay\n"
"đổi thử nghiệm và chuyển giao chúng, bạn có thể loại bỏ bất kỳ lần chuyển\n"
-"giao nà o trong tình trạng nà y mà không cần Ä\91ụng cháºm đến bất kỳ nhánh nào\n"
-"bằng cách thực hiện lần lấy ra khác nữa.\n"
+"giao nà o trong tình trạng nà y mà không cần Ä\91ụng chạm đến bất kỳ nhánh nào\n"
+"bằng cách chuyển trở lại một nhánh.\n"
"\n"
"Nếu bạn muốn tạo một nhánh mới để giữ lại các lần chuyển giao bạn tạo,\n"
-"bạn có thể làm thế (ngay bây giờ hay sau này) bằng cách chạy lệnh checkout\n"
-"lần nữa với tùy chọn -b. Ví dụ:\n"
+"bạn có thể làm thế (ngay bây giờ hay sau này) bằng cách dùng tùy chọn\n"
+"dòng lệnh -b. Ví dụ:\n"
+"\n"
+" git checkout -c <tên-nhánh-mới>\n"
+"\n"
+"Hoàn lại thao tác này bằng:\n"
+"\n"
+" git switch -\n"
"\n"
-" git checkout -b <tên-nhánh-mới>\n"
+"Tắt hướng dẫn này bằng cách đặt biến advice.detachedHead thành false\n"
"\n"
#: alias.c:50
#: alias.c:51
msgid "unclosed quote"
-msgstr "chưa đóng trích dẫn"
+msgstr "chưa có dấu nháy đóng"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "không nhận ra tùy chọn về khoảng trắng “%s”"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject và --3way không thể dùng cùng nhau."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached và --3way không thể dùng cùng nhau."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way ở ngoài một kho chứa"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index ở ngoài một kho chứa"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached ở ngoài một kho chứa"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
"Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) "
"%s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
-#: apply.c:950
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d"
-#: apply.c:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "chế độ không hợp lệ trên dòng %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "phần đầu mâu thuẫn dòng %d và %d"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong "
"thành phần dẫn đầu tên của đường dẫn (dòng %d)"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá hỏng tại dòng %d"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "tập tin đã xóa %s vẫn còn nội dung"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác” tại dòng %d"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay đọc %s"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%c”"
-#: apply.c:3066
+#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
-#: apply.c:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”"
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược hunk thành "
+"không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành "
"“%s”"
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy "
"đủ"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại."
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "không thể đọc postimage %s cần thiết cho “%s”"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”"
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận "
"%s)"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Đang trở lại hòa trộn “3-đường”…\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "không thể đọc nội dung hiện hành của “%s”"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Đã áp dụng miếng vá %s với các xung đột.\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "loại bỏ miếng vá để lại nội dung tập tin"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "đường dẫn không hợp lệ “%s”"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: apply.c:3971
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: apply.c:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
-msgstr "không thểghi mục lục tạm vào %s"
+msgstr "không thể ghi mục lục tạm vào %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "không thể lấy thống kề về tập tin %s mới hơn đã được tạo"
+msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo"
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4549
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…"
-#: apply.c:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "Đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "Bỏ qua đường dẫn “%s”."
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4920
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "đường-dẫn"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "số"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "hành động"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng nội dung"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "chi tiết"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "gốc"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "treo thêm <root> vào tất cả các tên tập tin"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+msgstr "git archive [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
#: archive.c:15
msgid "git archive --list"
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <kho> [--exec <lệnh>] [<các-tùy-chọn>] <tree-ish> "
-"[<đường-dẫn>…]"
+"git archive --remote <kho> [--exec <lệnh>] [<các tùy chọn>] <tree-ish> [</"
+"đường/dẫn>…]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgid "not a tree object: %s"
msgstr "không phải là đối tượng cây: “%s”"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "thư mục làm việc hiện hành chưa được theo dõi"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "tập_tin"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "nén nhỏ hơn"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "kho"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "lệnh"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
-msgstr "Gặp tùy chọn --remote không cần"
+msgstr "Gặp tùy chọn không cần --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "tùy chọn--contents và --reverse không được trộn vào nhau."
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
+"cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-"--reverse --first-parent cùng nhau yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
+"cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
"tiên"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "không có đường dẫn %s trong “%s”"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "không thể đọc blob %s cho đường dẫn “%s”"
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%s”."
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD của cây làm việc %s chưa được cập nhật"
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
msgid "Repository lacks these prerequisite commits:"
msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "cần một kho chứa để thẩm tra một bundle"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "không thể nhân đôi bộ mô tả bundle"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list đã chết"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%s”"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "mục lục gói đã chết"
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"Tắt lời nhắn này bằng cách chạy\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
-msgstr "tập tin đồ thị các lần chuyển giao quá nhỏ"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
-msgstr "chữ ký đồ thị lần chuyển giao %X không khớp chữ ký %X"
+msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
-msgstr "phiên bản đồ đồ thị lần chuyển giao %X không khớp phiên bản %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
-msgstr "phiên bản đồ thị lần chuyển giao %X không khớp phiên bản %X"
+msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-"mục tin bảng tìm kiếm mảnh còn thiếu; tập tin có thể sẽ không hoàn thiện"
+"bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể sẽ "
+"không hoàn thiện"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "bù mảnh không đúng chỗ %08x%08x"
+msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "mã mảnh đồ thị lần chuyển giao %08x xuất hiện nhiều lần"
+msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần"
+
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng '%s' không phải là "
+"một mã băm"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:390
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
+"bị hỏng"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "không thể tìm thấy lần chuyển giao %s"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "không thể lấy kiểu của đối tượng “%s”"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr ""
"Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
"chuyển giao"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
-msgstr "Đang tính toán số tạo sơ đồ các lần chuyển giao"
+msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "gặp lỗi thêm gói %s"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "gặp lỗi khi mở mục lục cho “%s”"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr ""
"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
"tượng đã đóng gói"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s”"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "Đang quét các lần chuyển giao đã hòa trộn"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "định dạng đồ họa các lần chuyển giao không thể ghi %d lần chuyển giao"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-"tập tin sơ đồ chuyển giao có tổng kiểm không đúng và có vẻ như là đã hỏng"
+"tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
+"đã hỏng"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "đồ thị lần chuyển giao có thứ tự OID không đúng: %s sau %s"
+msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-"đồ thị lần chuyển giao có giá trị fanout không đúng: fanout[%d] = %u != %u"
+"đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
+"%u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
-msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ thị lần chuyển giao"
+msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
"thị lần chuyển giao"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-"OID cây gốc cho lần chuyển giao %s trong đồ thị lần chuyển giao là %s != %s"
+"OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
+"%s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-"danh sách cha mẹ đồ thị lần chuyển giao cho lần chuyển giao %s là quá dài"
+"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
-msgstr "cha mẹ đồ thị lần chuyển giao cho %s là %s != %s"
+msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-"danh sách cha mẹ đồ thị lần chuyển giao cho lần chuyển giao %s bị chấm dứt "
-"quá sớm"
+"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
+"dứt quá sớm"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-"đồ thị lần chuyển giao có con số không lần tạo cho lần chuyển giao %s, nhưng "
-"không phải số không ở chỗ khác"
+"đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
+"nhưng không phải số không ở chỗ khác"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-"đồ thị lần chuyển giao có con số không phải không lần tạo cho lần chuyển "
+"đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
"giao %s, nhưng số không ở chỗ khác"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "tạo đồ thị lần chuyển giao cho lần chuyển giao %s là %u != %u"
+msgstr "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-"ngày chuyển giao cho lần chuyển giao %s trong đồ thị lần chuyển giao là "
+"ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là "
"%<PRIuMAX> != %<PRIuMAX>"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"Nguyên nhân có thể là gồm quẩn vòng."
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "không thể khai triển đường dẫn “%s”"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "các bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "các điều kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "khóa không chứa một phần: %s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "khóa không chứa bất kỳ một tên biến nào: %s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "khóa không hợp lệ (dòng mới): %s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "tham số cấu hình không có thực: %s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "định dạng không có thực trong %s"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "cấu hình sai tại dòng %d trong tập tin %s"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "cấu hình sai tại dòng %d trong %s"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s”: %s"
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong blob %s: %s"
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong tập tin %s: %s"
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong đầu vào tiêu chuẩn: %s"
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"sai giá trị bằng số của cấu hình “%s” cho “%s” trong submodule-blob %s: %s"
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong dòng lệnh %s: %s"
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "“%s” dành cho “%s” không phải là dấu vết thời gian hợp lệ"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "chiều dài abbrev nằm ngoài phạm vi: %d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar chỉ được có một ký tự"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "giá trị cho %s sai dạng"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "giá trị cho %s sai dạng: %s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "không thể tải đối tượng blob cấu hình “%s”"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "tham chiếu “%s” không chỉ đến một blob nào cả"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "không thể phân giải điểm xét duyệt “%s”"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "gặp lỗi khi phân tích cú pháp %s"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”"
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "tên của phần không hợp lệ “%s”"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "không thể khóa tập tin cấu hình %s"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "đang mở “%s”"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "mẫu không hợp lệ: %s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "tập tin cấu hình “%s” không hợp lệ"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "không thể mmap “%s”"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "chmod trên %s gặp lỗi"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "không thể ghi tập tin cấu hình “%s”"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "tên của phần không hợp lệ: %s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "thiếu giá trị cho cho “%s”"
msgid "unable to fork"
msgstr "không thể rẽ nhánh tiến trình con"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
msgstr ""
"biểu thức chính quy island từ cấu hình có quá nhiều nhóm chụp (tối đa=%d)"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "Đã đánh dấu %d island, xong.\n"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git diff --no-index [<các-tùy-chọn>] <đường-dẫn> <đường-dẫn>"
+msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>"
#: diff-no-index.c:263
msgid ""
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "giá trị --stat không hợp lệ: “%s”"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "tùy chọn “%s” cần một giá trị bằng số"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s cần dạng <n>/<m>"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s cần một ký tự, nhưng lại nhận được “%s”"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "đối số --color-moved sai: %s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
"\"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "tham số cho %s không hợp lệ"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "đối số --word-diff sai: %s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "tạo miếng vá"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "tạo khác biệt ở định dạng thô"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "đồng nghĩa với “-p --raw”"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "đồng nghĩa với “-p --stat”"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "--stat thuận tiện cho máy đọc"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "chỉ xuất những dòng cuối của --stat"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<tham_số_1,tham_số_2>…"
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "đồng nghĩa với --dirstat=cumulative"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "chỉ hiển thị tên của các tập tin đổi"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<width>[,<name-width>[,<count>]]"
+msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "tạo diffstat"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<rộng>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "tạo diffstat với độ rộng đã cho"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "tạo diffstat với tên độ rộng đã cho"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "tạo diffstat với độ rộng đồ thị đã cho"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<số_lượng>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "tạo diffstat với các dòng bị giới hạn"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "tạo tổng hợp xúc tích trong diffstat"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
"\""
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "hiển thị thay đổi được tô màu"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
-msgstr "<kind>"
+msgstr "<kiểu>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"tô sang các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” "
"trong khác biệt"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra "
"trong --raw hay --numstat"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
-msgstr "<tiền tố>"
+msgstr "<tiền_tố>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
"định"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<ký_tự>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "Tùy chọn khác biệt đổi tên"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "dò tìm các tên thay đổi"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "dò bản sao"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "tắt dò tìm đổi tên"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "dung các blob trống rống như là nguồn đổi tên"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
"quá giới hạn đưa ra"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "Tùy chọn thuật toán khác biệt"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "sản sinh khác biệt ít nhất có thể"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<thuật toán>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "chọn một thuật toán khác biệt"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<văn bản>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<chế độ>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"hiển thị khác biệt từ, sử dung <chế độ> để bỏ giới hạn các từ bị thay đổi"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "dùng <regex> để quyết định từ là cái gì"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "bỏ qua khoảng trắng như thế nào trong --color-moved"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "Các tùy chọn khác biệt khác"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"khi chạy từ thư mục con, thự thi các thay đổi bên ngoài và hiển thị các "
"đường dẫn liên quan"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "coi mọi tập tin là dạng văn bản thường"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "tắt mọi kết xuất của chương trình"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị "
"phân"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<khi>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<định dạng>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "ẩn các mục “git add -N” từ bảng mục lục"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<chuỗi>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
"chuỗi được chỉ ra"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
"thức chính quy được chỉ ra"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<mã-số-đối-tượng>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
"tượng được chỉ ra"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "chọn các tập tin theo kiểu khác biệt"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<tập_tin>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "Xuất ra một tập tin cụ thể"
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "không tìm thấy đối tượng: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "xong"
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Máy chủ không hỗ trợ máy khách shallow"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Máy chủ hỗ trợ no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Máy chủ hỗ trợ multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Máy chủ hỗ trợ side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Máy chủ hỗ trợ side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Máy chủ hỗ trợ ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Máy chủ hỗ trợ bộ lọc"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "Máy chủ hỗ trợ %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "Máy chủ không hỗ trợ máy khách shallow"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "Máy chủ hỗ trợ bộ lọc"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "không thể ghi các yêu cầu lên máy phục vụ"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "cần “%s”, nhưng lại nhận “%s”"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "gặp dòng không được thừa nhận: “%s”"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "cần tập tin gói để gửi sau “ready”"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "không cần thêm phần nào để gửi sau “ready”"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "lỗi xử lý thông tin shallow: %d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "không cần wanted-ref: “%s”"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "lỗi khi xử lý wanted refs: %d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "không có máy chủ tham chiếu nào như %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg gặp lỗi khi ký dữ liệu"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
msgid "These are common Git commands used in various situations:"
msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:"
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "không hỗ trợ liệt kê lệnh kiểu “%s”"
#: help.c:714
msgid "git version [<options>]"
-msgstr "git version [<các-tùy-chọn>]"
+msgstr "git version [<các tùy chọn>]"
#: help.c:782
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
msgid "sparse:path filters support has been dropped"
msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "đặc tả bộ lọc không hợp lệ “%s”"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor"
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
msgid "error building trees"
msgstr "gặp lỗi khi xây dựng cây"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "gặp lỗi khi tạo đường dẫn “%s”%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể đọc đối tượng %s “%s”"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "mong đợi đối tượng blob cho %s “%s”"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "gặp lỗi khi mở “%s”: %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì với %06o %s “%s”"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-"
"trộn)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
"Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao "
"theo sau hòa trộn)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"cái mà sẽ chấp nhận gợi ý này.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào "
"%s."
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree)."
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree)."
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
"còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
"của %s còn lại trong cây (tree) tại %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên "
"đường."
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
"Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm "
"thành %s"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
"tên \"%s\"->\"%s\" trong \"%s\"%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s"
-#: merge-recursive.c:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến "
"nhận một phần nhiều của các tập tin."
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
"của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s."
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; "
"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
"%s->%s trong %s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
"bị đổi tên."
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "nội dung"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
"đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
"đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
"thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
"mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
"%s"
-#: merge-recursive.c:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"hòa trộn:\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "Đã cập nhật rồi!"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "hòa trộn các cây %s và %s gặp lỗi"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục."
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "không nhận ra phiên bản %d của multi-pack-index"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "phiên bản băm “%u” không khớp"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "mã mảnh kết thúc multi-pack-index xuất hiện sớm hơn bình thường"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id sai: %u (%u các gói tổng)"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gặp lỗi khi mở pack-index “%s”"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "đã không thấy tập tin gói %s để mà xóa"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "Đang khóa cho các gói bị tham chiếu"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "Thẩm tra thứ tự OID trong MIDX"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "Đang thẩm tra các khoảng bù đối tượng"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "không thể lấy thông tin thống kê về các đối tượng gói"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "không thể hoàn thiện các đối tượng gói"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "không thể tạo tuyến lazy_dir: %s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "không thể tạo tuyến lazy_name: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "không thể gia nhập tuyến lazy_name: %s"
msgid "hash mismatch %s"
msgstr "mã băm không khớp %s"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)"
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "không thể lấy thông tin thống kê về “log“"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "không thể đọc kết xuất “log”"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "không thể phân tích cú pháp phần đầu git “%.*s”"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "gặp lỗi khi tạo khác biệt"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "không thể phân tích nhật ký cho “%s”"
msgstr "các mục tin stage không đúng thứ tự cho “%s”"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
msgid "broken index, expect %s in %s, got %s"
msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần "
"chuyển giao.\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "không thể ghi “%s”"
"Cánh ứng xử có thể là: ignore, warn, error.\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "“%s” không chỉ đến một lần chuyển giao hợp lệ nào cả!"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "đang lờ đi tham chiếu mềm thừa %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "không thể mở “%s” để ghi: %s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "không thể đọc tham chiếu “%s”"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "tham chiếu “%s” đã có từ trước rồi"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "không cần ID đối tượng khi ghi “%s”"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "không thể mở “%s” để ghi"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "gặp ID đối tượng không cần khi xóa “%s”"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "nhật ký cho tham chiếu %s có khoảng trống sau %s"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "nhật ký cho tham chiếu %s kết thúc bất ngờ trên %s"
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "nhật ký cho %s trống rỗng"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "từ chối cập nhật tham chiếu với tên sai “%s”"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref bị lỗi cho ref “%s”: %s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "không cho phép đa cập nhật cho tham chiếu “%s”"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "“%s” sẵn có; không thể tạo “%s”"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "không thể xử lý “%s” và “%s” cùng một lúc"
msgid "invalid refspec '%s'"
msgstr "refspec không hợp lệ “%s”"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "đã ra đi"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "phía trước %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "đằng sau %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "không nhận ra màu: %%(màu:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) không nhận các đối số"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "tham số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) không nhận các đối số"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) không nhận các đối số"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "cần nội dung mang giá trị dương:shot=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "đối số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "đối số không được thừa nhận %%(if): %s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
"không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu "
"đối tượng"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(không nhánh, đang cải tổ %s)"
-
-#: ref-filter.c:1456
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
+msgid "no branch, rebasing %s"
+msgstr "không nhánh, đang cải tổ %s"
-#: ref-filter.c:1459
+#: ref-filter.c:1488
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "không nhánh, đang cải tổ HEAD %s đã tách rời"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD được tách rời tại %s)"
-
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách rời từ %s)"
+msgid "no branch, bisect started on %s"
+msgstr "không nhánh, di chuyển nửa bước được bắt đầu tại %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(không nhánh)"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "không nhánh"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "tùy chọn “%s” là xung khắc với tùy chọn --merged"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "tùy chọn “%s” là xung khắc với tùy chọn --no-merged"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao"
msgid "Recorded preimage for '%s'"
msgstr "Preimage đã được ghi lại cho “%s”"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
msgid "unable to open rr-cache directory"
msgstr "không thể mở thư mục rr-cache"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả"
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s"
msgid "could not delete '%s'"
msgstr "không thể xóa bỏ “%s”"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "không thể gỡ bỏ “%s”"
+
+#: sequencer.c:321
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "không nhận ra thao tác: %d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”"
+"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”"
-#: sequencer.c:385
+#: sequencer.c:388
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 ""
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
-"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
+"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
"và chuyển giao kết quả bằng lệnh “git commit”"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "gặp lỗi khi hoàn thành “%s”"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "không thể đọc “%s”"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "không có khóa hiện diện trong “%.*s”"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "không thể giải trích dẫn giá trị của “%s”"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "không hiểu biến “%s”"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "thiếu “GIT_AUTHOR_NAME”"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "thiếu “GIT_AUTHOR_DATE”"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "định dạng ngày tháng không hợp lệ “%s” trong “%s”"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "ghi chuyển giao gốc"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "móc “prepare-commit-msg” bị lỗi"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr " (root-commit)"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "không thể phân tích HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s không phải là một lần chuyển giao!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "không thể phân tích tác giả của lần chuyển giao"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "không thể đọc phần chú thích (message) từ “%s”"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "không thể sửa chữa lần chuyển giao gốc"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s không nhận các đối số: “%s”"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "thiếu đối số cho %s"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "không thể phân tích cú pháp “%.*s”"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "không thể đọc “%s”."
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "squash-onto không dùng được"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "có thao tác hoàn nguyên đang được thực hiện"
+
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "có thao tác “cherry-pick” đang được thực hiện"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "không có tiến trình hoàn nguyên nào"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "không có cherry-pick đang được thực hiện"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "ở đây không có gì để mà bỏ qua cả"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"bạn đã sẵn sàng chuyển giao chưa?\n"
+"thử \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Không thể áp dụng %s… %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "Không hòa trộn %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "tên nhãn dị hình: “%.*s”"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "ghi lần chuyển giao gốc giả"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "đang ghi squash-onto"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "gặp lỗi khi tìm cây của %s"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "không thể ghi bảng mục lục"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "không thể phân tích “%.*s”"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "chẳng có gì để hòa trộn: “%.*s”"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "không thể lấy chú thích của lần chuyển giao của “%s”"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
"nào.\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "không thể lấy ra %s"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s không phải là một OID hợp lệ"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Dừng lại ở HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "Dừng lại ở %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "không thể ghi tập tin: “%s”"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script: các tùy chọn được không xử lý"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"continue”.\n"
"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "không có gì để làm"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "văn lệnh đã sẵn được sắp đặt rồi."
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap gặp lỗi"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "tập tin đối tượng %s trống rỗng"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "đối tượng mất hỏng “%s”"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "gặp rác tại cuối của đối tượng bị mất “%s”"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "kiểu đối tượng không hợp lệ"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "không thể giải gói phần đầu %s"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "không thể phân tích phần đầu của “%s”"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "gặp lỗi khi đọc đối tượng “%s”"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "c%s thay thế không được tìm thấy cho %s"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "không thể ghi tập tin %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "không thể đặt quyền thành “%s”"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "lỗi ghi tập tin"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
"không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "không thể ghi tập tin đối tượng đã mất"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "không thể xả nén đối tượng mới %s (%d)"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "gặp lỗi utime() trên “%s”"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "không thể đọc đối tượng cho %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "lần chuyển giao sai hỏng"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "thẻ sai hỏng"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "gặp lỗi đọc khi đánh mục lục %s"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "không đọc ngắn khi đánh mục lục %s"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: kiểu tập tin không được hỗ trợ"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s không phải là một đối tượng hợp lệ"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "mã băm không khớp cho %s (cần %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "không thể mmap %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "không thể giải gói phần đầu của “%s”"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "không thể phân tích phần đầu của “%s”"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "không thể giải gói nội dung của “%s”"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
"\n"
-" git checkout -b $br $(git rev-parse …)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
"tạo ra.\n"
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/giây"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u byte/giây"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
msgstr ""
"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ."
msgid "Submodule '%s' could not be updated."
msgstr "Mô-đun-con “%s” không thể được cập nhật."
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "không thể lấy thông tin thống kê về ls-files trong .."
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
msgid "failed to push all needed submodules"
msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "thao tác không được gia thức hỗ trợ"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
msgid "error while running fast-import"
msgstr "gặp lỗi trong khi chạy fast-import"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "không thể đọc tham chiếu %s"
msgid "helper %s does not support 'push-option'"
msgstr "helper %s không hỗ trợ “push-option”"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s không hỗ trợ “force”"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "không thể chạy fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "gặp lỗi trong khi chạy fast-export"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"cả.\n"
"Tuy nhiên bạn nên chỉ định một nhánh như “master” chẳng hạn.\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "read(%s) gặp lỗi"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "write(%s) gặp lỗi"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "tuyến trình %s gặp lỗi"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "xử lý %s gặp lỗi khi đợi"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "xử lý %s gặp lỗi"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
msgid "empty filename in tree entry"
msgstr "tên tập tin trống rỗng trong mục tin cây"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
msgstr "Bãi bỏ\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Đang lấy ra các tập tin"
+msgid "Updating files"
+msgstr "Đang cập nhật các tập tin"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "đoạn đường dẫn “..” không hợp lệ"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" không tồn tại"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "“%s” không chỉ ngược đến “%s”"
msgid "unable to get current working directory"
msgstr "không thể lấy thư mục làm việc hiện hành"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (dùng \"git restore --staged <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (dùng \"git restore --source=%s --staged <tập-tin>…\" để bỏ ra khỏi bệ "
+"phóng)"
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
"cần được giải quyết)"
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-" (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục "
-"làm việc)"
+" (dùng \"git restore <tập-tin>…\" để loại bỏ các thay đổi trong thư mục làm "
+"việc)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa "
"chữa trong mô-đun-con)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "được thêm vào bởi chúng ta:"
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "bị xóa đi bởi họ:"
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "được thêm vào bởi họ:"
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "bị xóa bởi chúng ta:"
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "tập tin mới:"
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "đã chép:"
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "đã xóa:"
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "đã sửa:"
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "đã đổi tên:"
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "đổi-kiểu:"
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "không hiểu:"
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "chưa hòa trộn:"
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "lần chuyển giao mới, "
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "nội dung bị sửa đổi, "
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:896
+#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục"
-#: wt-status.c:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:"
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"Không sửa hay xóa bỏ đường ở trên.\n"
"Mọi thứ phía dưới sẽ được xóa bỏ."
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
+"Bạn có thể dùng '--no-ahead-behind' tránh phải điều này.\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn."
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "Bạn đang ở giữa của một phiên “am”."
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")"
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "thiếu git-rebase-todo."
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1289
+#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "Bạn hiện nay đang thực hiện việc “rebase” (“cải tổ”)."
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")"
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)"
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --"
"continue\")"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
"đang “rebase” nhánh “%s” trên “%s”."
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
"rebase."
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git "
"rebase --continue\")"
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
"rebase nhánh “%s” trên “%s”."
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)"
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài "
"lòng về những thay đổi của mình)"
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick hiện tại đang được thực hiện."
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
" (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
"continue\")"
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Hoàn nguyên hiện tại đang thực hiện."
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)"
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD được tách rời từ "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "Vẫn chưa chuyển giao"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "khác"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<các
-tùy-chọn>] [--] <pathspec>…"
+msgstr "git add [<các
tùy chọn>] [--] <pathspec>…"
#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "cập nhật tập tin gặp lỗi"
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "chạy thử"
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…"
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n"
"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó."
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"không thể được tương tác mà không có stdin kết nối với một thiết bị cuối."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "Dùng “git am --show-current-patch” để xem miếng vá bị lỗi"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
"vá này."
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ"
"\" cho nó."
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "Không thể phân tích đối tượng “%s”."
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
+msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
+msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá."
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD chỉ đến nó."
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "hiển thị miếng vá đã được áp dụng rồi."
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "dùng dấu thời gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "Các lần chuyển giao ký-GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lênh"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<các-tùy-chọn>] [<miếng-vá>…]"
+msgstr "git apply [<các tùy chọn>] [<miếng-vá>…]"
#: builtin/archive.c:17
#, c-format
"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<sai> [<đúng>…]] [--] [<đường/dẫn>…]"
+"=<term>][--no-checkout] [<sai> [<đúng>…]] [--] [</các/đường/dẫn>…]"
#: builtin/bisect--helper.c:86
#, c-format
msgid "bad HEAD - strange symbolic ref"
msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "refspec không hợp lệ: “%s”"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "thực hiện “git bisect next”"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "dọn dẹp tình trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "kiểm tra cho điểm xem xét cần dùng"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "đặt lại trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "kiểm tra và đặt thời điểm trong di chuyển nửa bước"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "in ra các thời điểm di chuyển nửa bước"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "bắt đầu phiên di chuyển nửa bước"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "không có nhật ký cho BISECT_WRITE"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms cần hai tham số"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state không nhận đối số"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
"--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write cần 4 hoặc 5 tham số"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms cần 3 tham số"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms cần 0 hoặc 1 tham số"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<các-tùy-chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
+msgstr "git blame [<các tùy chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "cần một màu: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "phải kết thúc bằng một màu"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "màu không hợp lệ cho blame.coloring"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "không thể tìm thấy điểm xét duyệt %s để mà bỏ qua"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "Hiển thị thống kê công sức làm việc"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "Ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "Hiển thị số dòng gốc (Mặc định: off)"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "rev"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "bỏ qua <rev> khi blame"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "Bỏ qua các điểm xét duyệt từ <tập tin>"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "các dòng màu theo tuổi"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "tập tin %s chỉ có %lu dòng"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Các dòng blame"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<các-tùy-chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
+msgstr "git branch [<các tùy chọn>] [-l] [-f] <tên-nhánh> [<điểm-đầu>]"
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<các-tùy-chọn>] [-r] (-d | -D) <tên-nhánh> …"
+msgstr "git branch [<các tùy chọn>] [-r] (-d | -D) <tên-nhánh> …"
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
+msgstr "git branch [<các tùy chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<các-tùy-chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
+msgstr "git branch [<các tùy chọn>] (-c | -C) [<nhánh-cũ>] <nhánh-mới>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--points-at]"
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--format]"
+msgstr "git branch [<các tùy chọn>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"đang xóa nhánh “%s” mà nó lại đã được hòa trộn vào\n"
" “%s”, nhưng vẫn chưa được hòa trộn vào HEAD."
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"không xóa nhánh “%s” cái mà chưa được hòa trộn vào\n"
" “%s”, cho dù là nó đã được hòa trộn vào HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho “%s”"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"Nhánh “%s” không được trộn một cách đầy đủ.\n"
"Nếu bạn thực sự muốn xóa nó, thì chạy lệnh “git branch -D %s”."
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "không thể phân tích chuỗi định dạng"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "Gặp lỗi khi sao chép nhánh"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "không dùng"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "Bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "sao chép một nhánh và reflog của nó"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "hiển thị nhánh hiện hành"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "sắp xếp và lọc là phân biệt HOA thường"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "tùy chọn --column và --verbose xung khắc nhau"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "không thể sửa mô tả cho nhiều hơn một nhánh"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Vẫn chưa chuyển giao trên nhánh “%s”."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "quá nhiều nhánh dành cho thao tác sao chép"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "quá nhiều tham số cho thao tác đổi tên"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "quá nhiều tham số để đặt thượng nguồn mới"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh "
"nào cả."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Nhánh “%s” không có thông tin thượng nguồn"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên "
-"nhánh"
+"Hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không nhận một tên "
+"nhánh.\n"
+"Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "chỉ một tùy chọn batch được chỉ ra"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "thoát với 0 khi không có lỗi"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "đừng sắp xếp đầu ra --batch-all-objects"
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<các-tùy-chọn>] <danh-bạ>…"
+msgstr "git check-mailmap [<các tùy chọn>] <danh-bạ>…"
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
+msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]"
#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "ghi nội dung vào tập tin tạm"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "chuỗi"
msgid "copy out the files from named stage"
msgstr "sao chép ra các tập tin từ bệ phóng có tên"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<các-tùy-chọn>] <nhánh>"
+msgstr "git checkout [<các tùy chọn>] <nhánh>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…"
+msgstr "git checkout [<các tùy chọn>] [<nhánh>] -- <tập-tin>…"
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<các tùy chọn>] [<nhánh>]"
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng ta"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "đường dẫn “%s” không có các phiên bản của chúng"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "đường dẫn “%s” không có các phiên bản cần thiết"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Không thể thêm kết quả hòa trộn cho “%s”"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Đã tạo lại %d xung đột hòa trộn"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Đã cập nhật đường dẫn %d từ %s"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "không được dùng “%s” với các đường dẫn cập nhật"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s” với %s"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc."
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "đường dẫn “%s” không được hòa trộn"
+msgid "neither '%s' or '%s' is specified"
+msgstr "không chỉ định '%s' không '%s'"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Đã tạo lại %d xung đột hòa trộn"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "phải có “%s” khi không chỉ định “%s”"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "Đã cập nhật đường dẫn %d từ %s"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' hay '%s' không thể được sử dụng với %s"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục"
+msgid "path '%s' is unmerged"
+msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"sau:\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr ""
"các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: %s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thực hiện reflog cho “%s”: %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "chỉ cần một tham chiếu"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
"Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được “%s”"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "cần một nhánh, nhưng lại nhận được “%s”"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi đang hòa trộn\n"
+"Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhanh ở giữa một phiên am\n"
+"Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi cải tổ\n"
+"Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi cherry-picking\n"
+"Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"không thể chuyển nhánh trong khi hoàn nguyên\n"
+"Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr ""
+"bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
+"bước"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s” không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "“%s” không thể nhận <điểm-đầu>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "nhánh"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "tạo và checkout một nhánh mới"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "tạo/đặt_lại và checkout một nhánh"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "tạo reflog cho nhánh mới"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "kiểu"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
+
+#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "kiểu"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "đừng gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "ép buộc báo cáo tiến triển công việc"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "dùng chế độ che phủ (mặc định)"
-
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p và --overlay loại từ lẫn nhau"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "không thể phân giải “%s”"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "bạn phải chỉ định các thư mục muốn hồi phục"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo "
"từ đó"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”"
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
"checkout.defaultRemote=origin trong cấu hình của bạn."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "nhánh"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "tạo và checkout một nhánh mới"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "tạo/đặt_lại và checkout một nhánh"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "tạo reflog cho nhánh mới"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "đoán thứ hai 'git checkout <không-nhánh-nào-như-vậy>' (mặc định)"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "dùng chế độ che phủ (mặc định)"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "tạo và chuyển đến một nhánh mới"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "tạo/đặt_lại và chuyển đến một nhánh"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "vứt bỏ các sửa đổi địa phương"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "lấy ra từ tree-ish nào"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "phục hồi bảng mục lục"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "phục hồi cây làm việc (mặc định)"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "bỏ qua những thứ chưa hòa trộn: %s"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "dùng chế độ che phủ"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>…"
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <mẫu>] [-x | -X] [--] </các/đường/"
+"dẫn>…"
#: builtin/clean.c:32
#, c-format
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (để trống) không chọn gì cả\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "Chọn mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "Giờ thì sao"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:"
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra."
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "không hiển thị tên của các tập tin đã gỡ bỏ"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
"cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:942
+#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n "
"mà cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clone.c:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]"
+msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "đặc-tả-đường-dẫn"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "số lượng mô-đun-con được nhân bản đồng thời"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "tên"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không "
"theo chúng nữa"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "gặp lỗi khi mở “%s”"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr "gặp lỗi khi bắt đầu lặp qua “%s”"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lỗi khi tạo được liên kết mềm %s"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi sao chép tập tin và “%s”"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "gặp lỗi khi lặp qua “%s”"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"Việc nhân bản thành công, nhưng checkout gặp lỗi.\n"
"Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n"
-"và thử lấy ra với lệnh “git checkout -f HEAD”\n"
+"và thử lấy ra với lệnh 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "không thể bỏ liên kết tập tin thay thế tạm thời"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s” đã sẵn tồn tại rồi."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thư mục làm việc dir “%s”"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Đang nhân bản thành kho chứa bare “%s”…\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
#: builtin/column.c:10
msgid "git column [<options>]"
-msgstr "git column [<các-tùy-chọn>]"
+msgstr "git column [<các tùy chọn>]"
#: builtin/column.c:27
msgid "lookup config vars"
msgid "duplicate parent %s ignored"
msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "không phải là tên đối tượng hợp lệ “%s”"
msgid "id of a parent commit object"
msgstr "mã số của đối tượng chuyển giao cha mẹ"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "chú thích"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
msgid "read commit log message from file"
msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Ký lần chuyển giao dùng GPG"
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<các
-tùy-chọn>] [--] <pathspec>…"
+msgstr "git commit [<các
tùy chọn>] [--] <pathspec>…"
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<các
-tùy-chọn>] [--] <pathspec>…"
+msgstr "git status [<các
tùy chọn>] [--] <pathspec>…"
#: builtin/commit.c:51
msgid ""
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "Nếu không được thì dùng lệnh \"git reset\"\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Nếu không được thì dùng lệnh \"git cherry-pick --skip\"\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
+"và sau đó dùng:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"để lại tiếp tục cherry-picking các lần chuyển giao còn lại.\n"
"Nếu bạn muốn bỏ qua lần chuyển giao này thì dùng:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
-"những lần chuyển giao còn lại.\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "không thể tạo bảng mục lục tạm thời"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "không thể cập nhật bảng mục lục tạm thời"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr ""
"không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
"không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:653
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"không thể chọn một ký tự ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
"chuyển giao.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ "
"tác giả nào sẵn có"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Chế độ bỏ qua không hợp lệ “%s”"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "hai tùy chọn -long và -z không tương thích với nhau"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổ”."
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F."
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend."
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được "
"sử dụng."
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý."
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "tính đầy đủ giá trị trước/sau"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "hiển thị trạng thái ở định dạng dài (mặc định)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
"no. (Mặc định: traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "không dò tìm các tên thay đổi"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "không hiển thị tổng kết sau khi chuyển giao thành công"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ "
"ra"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
"Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích "
"(message).\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"kho chứa đã được cập nhật, nhưng không thể ghi vào\n"
"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa\n"
"có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n"
-"và sau đó \"git reset HEAD\" để khắc phục."
+"và sau đó \"git restore --staged :/\" để khắc phục."
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <objdir>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <objdir>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr ""
+"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir </thư/mục/đối/tượng>] [--append|--"
+"split] [--reachable|--stdin-packs|--stdin-commits] <các tùy chọn chia tách>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "tmục"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "Thư mục đối tượng để lưu đồ thị"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "Không thể mở đồ thị chuyển giao “%s”"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "bắt đầu di chuyển tại mọi tham chiếu"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
"quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
"chuyển giao"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr ""
"bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr ""
-"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ thị lần chuyển giao"
+"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-"
+"giao"
+
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+"số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
+"chia cắt không-cơ-sở"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
"không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs"
#: builtin/config.c:11
msgid "git config [<options>]"
-msgstr "git config [<các-tùy-chọn>]"
+msgstr "git config [<các tùy chọn>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "đối số không được thừa nhận --type, %s"
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "giá trị được đưa kiểu này"
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "giá trị"
#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<các-tùy-chọn>] <commit-ish>*"
+msgstr "git describe [<các tùy chọn>] <commit-ish>*"
#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
-msgstr "git describe [<các-tùy-chọn>] --dirty"
+msgstr "git describe [<các tùy chọn>] --dirty"
#: builtin/describe.c:63
msgid "head"
msgid "do not consider tags matching <pattern>"
msgstr "không coi rằng các thẻ khớp với <mẫu>"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-"git difftool [<các-tùy-chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] "
-"<đường-dẫn>…]"
+"git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </"
+"đường/dẫn>…]"
#: builtin/difftool.c:253
#, c-format
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <các tùy chọn> <env-var>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "kiểu"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "mặc định cho git_env_*(...) để quay về"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "im lặng chỉ khi dung giá trị git_env_*() làm mã thoát"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"tùy chọn `--default' cần một giá trị logic với `--type=bool`, không phải `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"tùy chọn `--default' cần một giá trị số nguyên dài không dấu với `--"
+"type=ulong`, không phải `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "Đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "Nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "Bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "Áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Các cha mẹ tham chiếu cái mà k trong luồng dữ liệu fast-export bởi mã id đối "
"tượng"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "Hiển thị các mã id nguyên gốc của blobs/commits"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+msgstr "git fetch [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
-msgstr "git fetch [<các-tùy-chọn>] [<nhóm>"
+msgstr "git fetch [<các tùy chọn>] [<nhóm>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]"
+msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
-msgstr "git fetch --all [<các-tùy-chọn>]"
+msgstr "git fetch --all [<các tùy chọn>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "đường dẫn đến gói tải lên trên máy chủ cuối"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ "
"nữa"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
"mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
"tin cấu hình config)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr ""
"báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "chạy 'gc --auto' sau khi lấy về"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "không tìm thấy đối tượng %s"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "nên xóa chồng các thẻ có sẵn"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"Việc lấy về thường chỉ ra các nhánh buộc phải cập nhật,\n"
+"nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n"
+"'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'."
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"Việc này cần %.2f giây để kiểm tra các cập nhật ép buộc. Bạn có thể dùng\n"
+"'--no-show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates "
+"false'\n"
+"để tránh kiểm tra này.\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "Không thể lấy“%s” về"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
"partialClone"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
-msgstr "git for-each-ref [<các-tùy-chọn>] [<mẫu>]"
+msgstr "git for-each-ref [<các tùy chọn>] [<mẫu>]"
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
msgid "Checking %s link"
msgstr "Đang lấy liên kết %s"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
-msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]"
+msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
#: builtin/fsck.c:787
msgid "show unreachable objects"
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
#: builtin/gc.c:34
msgid "git gc [<options>]"
-msgstr "git gc [<các-tùy-chọn>]"
+msgstr "git gc [<các tùy chọn>]"
#: builtin/gc.c:90
#, c-format
msgid "cannot stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
"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:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [<các-tùy-chọn>] [-e] <mẫu> [<rev>…] [[--] <đường-dẫn>…]"
+msgstr "git grep [<các tùy chọn>] [-e] <mẫu> [<rev>…] [[--] </đường/dẫn>…]"
#: builtin/grep.c:225
#, c-format
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "xử lý tập tin nhị phân như là dạng văn bản thường"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "tìm kiếm trong thư mục con (mặc định)"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "chưa chỉ ra mẫu"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "không thể phân giải điểm xét duyệt: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "tùy chọn không được hỗ trợ với --recurse-submodules"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached hay --untracked không được sử dụng với --no-index"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "cả hai --cached và các cây phải được chỉ ra"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "kiểu"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "kiểu đối tượng"
msgid "no info viewer handled the request"
msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "“%s” được đặt bí danh thành “%s”"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "chuỗi alias.%s sai: %s"
msgid "'git help config' for more information"
msgstr "Chạy lệnh “git help config” để có thêm thông tin"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "kiểu đối tượng không khớp tại %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "không thể lấy về đối tượng cần %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "không thể điền thêm vào %d byte"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "gói đã vượt quá cỡ tối đa được phép"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%s”"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "không thể đọc thông tin đối tượng sẵn có %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "không thể đọc đối tượng đã tồn tại %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "lỗi fsck trong đối tượng đóng gói"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "đầy đủ với %d đối tượng nội bộ"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "gói có %d delta chưa được giải quyết"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "không thể ghi %s tập tin “%s”"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "không thể đóng tập tin được ghi %s “%s”"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "lỗi fsck trong các đối tượng gói"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "không thể mkdir (tạo thư mục): %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
"dir=<thư-mục>)"
-#: builtin/init-db.c:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Không thể truy cập cây (tree) làm việc “%s”"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "sửa các tập tin tại chỗ"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "bộ dò vết cắt bỏ phần trống rỗng"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "đặt phần đuôi mới ở đâu"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "thao tác khi đã có phần đuôi"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "thao tác khi thiếu phần đuôi"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "chỉ xuất phần đuôi"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "đừng áp dụng các quy tắc cấu hình"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "nối các giá trị khoảng-trắng-liên-tiếp"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "đặt các tùy chọn phân tích cú pháp"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "không coi --- là đặc biệt"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "bộ dò vết"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "bộ dò vết cần thêm"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer cùng với --only-input không hợp lý"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<các-tùy-chọn>] [<vùng-xem-xét>] [[--] <đường-dẫn>…]"
+msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]"
#: builtin/log.c:56
msgid "git show [<options>] <object>..."
-msgstr "git show [<các-tùy-chọn>] <đối-tượng>…"
+msgstr "git show [<các tùy chọn>] <đối-tượng>…"
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn--decorate không hợp lệ: %s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "không thể đọc đối tượng %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "không nhận ra kiểu: %d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "cần chính xác một vùng"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "không phải là một vùng"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "“cover letter” cần cho định dạng thư"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "gặp lỗi khi tạo các tập tin cover-letter"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
-msgstr "git format-patch [<các-tùy-chọn>] [<kể-từ> | <vùng-xem-xét>]"
+msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "hai thư mục kết xuất?"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "không hiểu lần chuyển giao %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "không tìm thấy nền hòa trộn chính xác"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
"\"--base=<base-commit-id>\" một cách thủ công"
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "gặp lỗi khi tìm nền hòa trộn chính xác"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "gặp lỗi khi suy luận range-diff (vùng khác biệt)"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "xuất mọi mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "rev"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá "
"đơn"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n và -k loại từ lẫn nhau"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff cần --cover-letter hoặc vá đơn"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff dựa trên v%d:"
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor yêu cầu --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff dựa trên v%d:"
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "Đang tạo các miếng vá"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
-msgstr "git ls-files [<các-tùy-chọn>] [<tập-tin>…]"
+msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]"
#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "thực thi"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<các-tùy-chọn>] <tree-ish> [<đường-dẫn>…]"
+msgstr "git ls-tree [<các tùy chọn>] <tree-ish> [</đường/dẫn>…]"
#: builtin/ls-tree.c:128
msgid "only show trees"
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<các-tùy-chọn>] [<commit>…]"
+msgstr "git merge [<các tùy chọn>] [<commit>…]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "tùy chọn “%s” yêu cầu một giá trị"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
"nhanh)"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:278
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "thẩm tra móc (hook) commit-msg"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "không phải là một đối tượng hợp lệ: %s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "Không cầm nắm gì ngoài hai head hòa trộn."
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể đọc từ “%s”"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất "
"việc hòa trộn.\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"topic.\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n"
"thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vời.\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
"quả.\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "Không phải nhánh hiện hành."
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit không nhận các đối số"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "Bạn không thể kết hợp --squash với --no-ff."
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "Bạn không thể kết hợp --squash với --commit."
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "từ chối hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "Đã cập nhật rồi."
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "Đã cập nhật rồi. Yeeah!"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Đang tua lại cây thành thời xa xưa…\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
-"git merge-file [<các-tùy-chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
+"git merge-file [<các tùy chọn>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
"tin1> <tập-tin-gốc> <tập-tin2>"
#: builtin/merge-file.c:35
msgstr "cho phép tạo nhiều hơn một cây"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<thư/mục>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<thư/mục>] (write|verify|expire|repack --"
+"batch-size=<cỡ>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
+"vào một bó cái mà lớn hơn kích thước này"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "có quá nhiều đối số"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "tùy chọn --batch-size chỉ cho lệnh con 'repack'"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "verb không được thừa nhận: %s"
+msgid "unrecognized subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<các-tùy-chọn>] <nguồn>… <đích>"
+msgstr "git mv [<các tùy chọn>] <nguồn>… <đích>"
#: builtin/mv.c:83
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<các-tùy-chọn>] <commit>…"
+msgstr "git name-rev [<các tùy chọn>] <commit>…"
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
-msgstr "git name-rev [<các-tùy-chọn>] --all"
+msgstr "git name-rev [<các tùy chọn>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<các-tùy-chọn>] --stdin"
+msgstr "git name-rev [<các tùy chọn>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "chỉ hiển thị tên (không SHA-1)"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "bỏ qua các tham chiếu khớp với <mẫu>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr ""
"liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "đọc từ đầu vào tiêu chuẩn"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
-msgstr "git notes add [<các-tùy-chọn>] [<đối-tượng>]"
+msgstr "git notes add [<các tùy chọn>] [<đối-tượng>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<các-tùy-chọn>] <từ-đối-tượng> <đến-đối-tượng>"
+msgstr "git notes copy [<các tùy chọn>] <từ-đối-tượng> <đến-đối-tượng>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
-msgstr "git notes append [<các-tùy-chọn>] [<đối-tượng>]"
+msgstr "git notes append [<các tùy chọn>] [<đối-tượng>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<các-tùy-chọn>] <notes-ref>"
+msgstr "git notes merge [<các tùy chọn>] <notes-ref>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
-msgstr "git notes merge --commit [<các-tùy-chọn>]"
+msgstr "git notes merge --commit [<các tùy chọn>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
-msgstr "git notes merge --abort [<các-tùy-chọn>]"
+msgstr "git notes merge --abort [<các tùy chọn>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
-msgstr "git notes prune [<các-tùy-chọn>]"
+msgstr "git notes prune [<các tùy chọn>]"
#: builtin/notes.c:92
msgid "git notes get-ref"
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
"chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa "
"trộn bằng “git notes merge --abort”.\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ."
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects --stdout [các-tùy-chọn…] [< <danh-sách-tham-chiếu> | < "
+"git pack-objects --stdout [các tùy chọn…] [< <danh-sách-tham-chiếu> | < "
"<danh-sách-đối-tượng>]"
#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-"git pack-objects [các-tùy-chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
+"git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
"sách-đối-tượng>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "CRC của đối tượng gói sai với %s"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "đối tượng đã đóng gói sai hỏng cho %s"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "dò thấy delta đệ quy cho đối tượng %s"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "tập tin gói không hợp lệ: %s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "không thể mở tập tin gói để dùng lại: %s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "không thể di chuyển vị trí đọc trong tập tin gói dùng lại"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "không thể đọc từ tập tin gói dùng lại"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "không thể lấy kích cỡ của %s"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "không thể phân tích phần đầu đối tượng của “%s”"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "không thể đọc đối tượng %s"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với "
"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - hết bộ nhớ"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Nén delta dùng tới %d tuyến trình"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "mâu thuẫn với số lượng delta"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"cần ID đối tượng cạnh, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"cần ID đối tượng, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "giá trị cho --missing không hợp lệ"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "không thể mở mục lục của gói"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "đối tượng mất tại %s không thể đã kiểm tra"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev “%s”"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "điểm xem xét sai “%s”"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "không thể thêm các đối tượng mới dùng"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<phiên bản>[,offset]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "dung thuật toán “sparse reachability”"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "bỏ qua gói này"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "ghi mục lục ánh xạ nếu được"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "xử lý cho thiếu đối tượng"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "tôn trọng island trong suốt quá trình nén “delta”"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "không thể dùng tùy chọn --filter mà không có --stdout"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "Đánh số các đối tượng"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
-msgstr "git pack-refs [<các-tùy-chọn>]"
+msgstr "git pack-refs [<các tùy chọn>]"
#: builtin/pack-refs.c:16
msgid "pack everything"
#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy của các mô-đun-con"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
"lấy về."
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
"về."
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"tự\n"
"đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
"một nhánh trên dòng lệnh."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n"
"từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về."
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao “%s”"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng."
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh."
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
+msgstr "git push [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-"git range-diff [<các
-tùy-chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
+"git range-diff [<các
tùy chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git range-diff [<các
-tùy-chọn>] <old-tip>…<new-tip>"
+msgstr "git range-diff [<các
tùy chọn>] <old-tip>…<new-tip>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git range-diff [<các
-tùy-chọn>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<các
tùy chọn>] <base> <old-tip> <new-tip>"
#: builtin/range-diff.c:21
msgid "Percentage by which creation is weighted"
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
-"git rebase [-i] [các-tùy-chọn] [--exec <lệnh>] [--onto <newbase>] "
+"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] "
"[<upstream>] [<nhánh>]"
#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-"git rebase [-i] [các-tùy-chọn] [--exec <lệnh>] [--onto <newbase>] --root "
+"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] --root "
"[<nhánh>]"
#: builtin/rebase.c:36
msgid "keep empty commits"
msgstr "giữ lại các lần chuyển giao rỗng"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "chấp nhận chuyển giao mà không ghi chú gì"
msgid "sign commits"
msgstr "ký các lần chuyển giao"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
msgid "the command to run"
msgstr "lệnh muốn chạy"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s cần một cải tổ kiểu tương tác"
msgid "Cannot store %s"
msgstr "Không thể lưu “%s”"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "không thể dò tìm điểm xét duyệt HEAD"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
"--abort\"."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"Kết quả là git không thể cải tổ lại chúng."
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase “<nhánh>”\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<nhánh> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "lệnh thực thi trống rỗng"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "cho phép móc (hook) pre-rebase được chạy"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "hãy im lặng. ý là --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "thêm dòng Signed-off-by: cho từng lần chuyển giao"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "chuyển cho “git am”"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "chuyển cho “git apply”"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "tiếp tục"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "bãi bỏ và lấy ra nhánh nguyên thủy"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "dùng chiến lược hòa trộn để cải tổ"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "tự động stash/stash pop trước và sau"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "dùng chiến lược hòa trộn đã cho"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "tùy chọn"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "chuyển thao số đến chiến lược hòa trộn"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "cải tổ tất các các lần chuyển giao cho đến root"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
"Xem mục tin của nó trong “ git help config” để biết chi tiết."
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
"thế."
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "không thể loại bỏ các thay đổi cây-làm-việc"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "không thể quay trở lại %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "không thể gỡ bỏ “%s”"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
"có một số thứ quý giá ở đây.\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "tùy chọn “%c” cần một giá trị bằng số"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "Không hiểu chế độ: %s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy cần --merge hay --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec cần --exec hay --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
"không thể tổ hợp các tùy chọn am với các tùy chọn tương tác hay hòa trộn"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "không thể kết hợp “--rebase-merges” với “--strategy-option”"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "không thể kết hợp “--rebase-merges” với “--strategy”"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "thượng nguồn không hợp lệ “%s”"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "Không thể tạo lần chuyển giao gốc mới"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "Gặp đáp ứng stash không cần: “%s”"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "Không thể tạo thư mục cho “%s”"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "Đã tạo autostash: %s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "không thể reset --hard"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "không thể chuyển đến %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD đã cập nhật."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "Thay đổi thành %s:\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Thay đổi từ %s thành %s:\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "Không thể tách rời HEAD"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
-msgstr "git remote add [<các-tùy-chọn>] <tên> <url>"
+msgstr "git remote add [<các tùy chọn>] <tên> <url>"
#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
-msgstr "git remote show [<các-tùy-chọn>] <tên>"
+msgstr "git remote show [<các tùy chọn>] <tên>"
#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
-msgstr "git remote prune [<các-tùy-chọn>] <tên>"
+msgstr "git remote prune [<các tùy chọn>] <tên>"
#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
-msgstr "git remote update [<các-tùy-chọn>] [<nhóm> | <máy-chủ>]…"
+msgstr "git remote update [<các tùy chọn>] [<nhóm> | <máy-chủ>]…"
#: builtin/remote.c:98
#, c-format
#: builtin/repack.c:22
msgid "git repack [<options>]"
-msgstr "git repack [<các-tùy-chọn>]"
+msgstr "git repack [<các tùy chọn>]"
#: builtin/repack.c:27
msgid ""
"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
"tượng hứa hẹn"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
"objects."
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "đóng gói mọi thứ trong một gói đơn"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "chuyển --delta-islands cho git-pack-objects"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "với -a, đóng gói lại các đối tượng không thể đọc được"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "kích thước cửa sổ được dùng cho nén “delta”"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "giới hạn độ sâu tối đa của “delta”"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "giới hạn số lượng tối đa tuyến trình"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "đừng đóng gói lại gói này"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable và -A xung khắc nhau"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "Không có gì mới để mà đóng gói."
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"CẢNH BÁO: nguyên gốc của nó cũng gặp lỗi.\n"
"CẢNH BÁO: Vui lòng đổi tên chúng trong %s bằng tay:\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "gặp lỗi khi gỡ bỏ “%s”"
#: builtin/replace.c:272
msgid "unable to spawn mktree"
-msgstr "không thể spawn mktree"
+msgstr "không thể sinh tiến trình con mktree"
#: builtin/replace.c:276
msgid "unable to read from mktree"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <đường-dẫn>…"
+msgstr "git reset [-q] [<tree-ish>] [--] </các/đường/dẫn>…"
#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>…]"
+msgstr "git reset --patch [<tree-ish>] [--] [</các/đường/dẫn>…]"
#: builtin/reset.c:40
msgid "mixed"
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git "
-"reset -- <đường_dẫn>”."
+"reset -- </các/đường/dẫn>”."
#: builtin/reset.c:355
#, c-format
msgid "Could not write new index file."
msgstr "Không thể ghi tập tin lưu bảng mục lục mới."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "lọc đối tượng yêu cầu --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "giá trị sparse không hợp lệ “%s”"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng"
#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]"
+msgstr "git rev-parse --parseopt [<các tùy chọn>] -- [<các tham số>…]"
#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-"git rev-parse --parseopt [<các-tùy-chọn>] -- [<các đối số>…]\n"
+"git rev-parse --parseopt [<các tùy chọn>] -- [<các đối số>…]\n"
" hoặc: git rev-parse --sq-quote [<đ.số>…]\n"
-" hoặc: git rev-parse [<các-tùy-chọn>] [<đ.số>…]\n"
+" hoặc: git rev-parse [<các tùy chọn>] [<đ.số>…]\n"
"\n"
"Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng."
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<các-tùy-chọn>] <commit-ish>…"
+msgstr "git revert [<các tùy chọn>] <commit-ish>…"
#: builtin/revert.c:25
msgid "git revert <subcommand>"
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<các-tùy-chọn>] <commit-ish>…"
+msgstr "git cherry-pick [<các tùy chọn>] <commit-ish>…"
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgid "cancel revert or cherry-pick sequence"
msgstr "không cherry-pick hay hoàn nguyên liên tiếp nhau"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "bỏ qua lần chuyển giao hiện tại và tiếp tục"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "đừng chuyển giao một cách tự động"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "sửa lại chú thích cho lần chuyển giao"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "số-cha-mẹ"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "chọn cha mẹ luồng chính"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "chiến lược hòa trộn"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "tùy chọn cho chiến lược hòa trộn"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "nối thêm tên lần chuyển giao"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
-msgstr "git rm [<các-tùy-chọn>] [--] <tập-tin>…"
+msgstr "git rm [<các tùy chọn>] [--] <tập-tin>…"
#: builtin/rm.c:207
msgid ""
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường/dẫn>…]]"
+msgstr "git shortlog [<các tùy chọn>] [<vùng-xét-duyệt>] [[--] [<đường/dẫn>…]]"
#: builtin/shortlog.c:15
msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git log --pretty=short | git shortlog [<các-tùy-chọn>]"
+msgstr "git log --pretty=short | git shortlog [<các tùy chọn>]"
#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "đang bỏ qua %s; không thể xử lý nhiều hơn %d tham chiếu"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "không tham chiếu nào khớp với %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "hiển thị các nhánh remote-tracking và nội bộ"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "hiển thị các nhánh remote-tracking"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "màu “*!+-” tương ứng với nhánh"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "đồng nghĩa với more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "chặn các chuỗi đặt tên"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "bao gồm nhánh hiện hành"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "hiển thị mọi cơ sở có thể dùng để hòa trộn"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "hiển thị các tham chiếu không thể được đọc bởi bất kỳ tham chiếu khác"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "hiển thị các lần hòa trộn có thể đọc được chỉ từ một đầu mút"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "sắp xếp hình thái học, bảo trì thứ tự ngày nếu có thể"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<cơ_sở>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "hiển thị <n> các mục “ref-log” gần nhất kể từ nền (base)"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog là không tương thích với các tùy chọn --all, --remotes, --"
"independent hay --merge-base"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "--reflog cần tên một nhánh"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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] "chỉ có thể hiển thị cùng lúc %d hạng mục."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "không có tham chiếu nào như thế %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "không thể xử lý nhiều hơn %d điểm xét duyệt."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "“%s” không phải tham chiếu hợp lệ."
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
#: builtin/stash.c:22 builtin/stash.c:37
msgid "git stash list [<options>]"
-msgstr "git stash list [<các-tùy-chọn>]"
+msgstr "git stash list [<các tùy chọn>]"
#: builtin/stash.c:23 builtin/stash.c:42
msgid "git stash show [<options>] [<stash>]"
-msgstr "git stash show [<các-tùy-chọn>] <stash>"
+msgstr "git stash show [<các tùy chọn>] <stash>"
#: builtin/stash.c:24 builtin/stash.c:47
msgid "git stash drop [-q|--quiet] [<stash>]"
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "Không thể cập nhật %s với %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "phần chú thích cho stash"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "Có lẽ bạn đã quên “git add ” phải không?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "giữ nguyên bảng mục lục"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "cất đi ở chế độ miếng vá"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "chế độ im lặng"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "bao gồm các tập tin bị bỏ qua"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "không thể thực thi %s"
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s"
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "điểm neo thay thế cho các đường dẫn tương đối"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules"
"run_command trả về trạng thái khác không cho %s\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"con lồng nhau của %s\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "Chặn kết xuất của từng lệnh mô-đun-con"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "Đệ quy vào trong các mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
"sở hữu chính nó."
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn "
"“%s”"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "Chặn két xuất tình trạng mô-đun-con"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
"Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
"đun-con"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "Chặn kết xuất cho đồng bộ url mô-đun-con"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn "
"thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại "
"bỏ chúng đi"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Đã xóa thư mục “%s”\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr "Gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "Bỏ đăng ký tất cả các trong mô-đun-con"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "mô-đun-con “%s” không thể thêm thay thế: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "nhân bản mô-đun-con mới vào chỗ nào"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "url nơi mà nhân bản mô-đun-con từ đó"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "không thể lấy thư mục mô-đun-con cho “%s”"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]"
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<các-tùy-chọn>] <tên> [<t.chiếu>]"
+msgstr "git symbolic-ref [<các tùy chọn>] <tên> [<t.chiếu>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…"
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Nội dung ghi chú còn lại %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "ép buộc sửa thẻ lần commit"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê"
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "chỉ có một tùy chọn -F hoặc -m là được phép."
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "quá nhiều đối số"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
-msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
+msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]"
#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<các-tùy-chọn>] -d <refname> [<biến-cũ>]"
+msgstr "git update-ref [<các tùy chọn>] -d <refname> [<biến-cũ>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<các-tùy-chọn>] <refname> <biến-mới> [<biến-cũ>]"
+msgstr "git update-ref [<các tùy chọn>] <refname> <biến-mới> [<biến-cũ>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
-msgstr "git update-ref [<các-tùy-chọn>] --stdin [-z]"
+msgstr "git update-ref [<các tùy chọn>] --stdin [-z]"
#: builtin/update-ref.c:364
msgid "delete the reference"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>"
+msgstr "git upload-pack [<các tùy chọn>] </đường/dẫn>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <lần_chuyển_giao>…"
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "hiển thị nội dung của lần chuyển giao"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "in kết xuất trạng thái gpg dạng thô"
msgid "show statistics only"
msgstr "chỉ hiển thị thống kê"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…"
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr "git worktree add [<các-tùy-chọn>] <đường-dẫn> [<commit-ish>]"
+msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]"
#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
-msgstr "git worktree list [<các-tùy-chọn>]"
+msgstr "git worktree list [<các tùy chọn>]"
#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
-msgstr "git worktree lock [<các-tùy-chọn>] </đường/dẫn>"
+msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>"
#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
-msgstr "git worktree prune [<các-tùy-chọn>]"
+msgstr "git worktree prune [<các tùy chọn>]"
#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree remove [<các-tùy-chọn>] <worktree>"
+msgstr "git worktree remove [<các tùy chọn>] <worktree>"
#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "gặp lỗi khi xóa “%s”"
"“%s” bị mất nhưng cây làm việc đã được đăng ký;\n"
"dùng “add -f” để ghi đè, hoặc “prune” hay “remove” để xóa"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "“%s” là cây làm việc chính"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "không thể phác họa ra tên đích đến “%s”"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "đích “%s” đã tồn tại rồi"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"không thể di chuyển một cây-làm-việc bị khóa;\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "gặp lỗi khi chạy “git status” vào “%s”"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "“%s” đang bẩn, hãy dùng --force để xóa nó"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"không thể xóa bỏ một cây-làm-việc bị khóa;\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s"
#: t/helper/test-serve-v2.c:7
msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<các-tùy-chọn>]"
+msgstr "test-tool serve-v2 [<các tùy chọn>]"
#: t/helper/test-serve-v2.c:19
msgid "exit immediately after advertising capabilities"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n"
"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
-"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
+"để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
+"Xem 'git help git' để biết tổng quan của hệ thống."
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "chưa chỉ ra thư mục cho --git-dir\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "chưa đưa ra cây làm việc cho --work-tree\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "chưa đưa ra tiền tố cho --super-prefix\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c cần một chuỗi cấu hình\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "chưa đưa ra thư mục cho -C\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "không hiểu tùy chọn: %s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "trong khi triển khai bí danh “%s”: “%s”"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"bí danh “%s” thay đổi biến môi trường.\n"
"Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "làm trống bí danh cho %s"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "đệ quy các bí danh: %s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
"dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s” không có điểm kết:%s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "không thể xử lý %s như là một phần bổ sung"
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"cách dùng: %s\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "gặp lỗi khi khai triển bí danh “%s”; “%s” không phải là lệnh git\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n"
msgid "no-op (backward compatibility)"
msgstr "no-op (tương thích ngược)"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr "chi tiết hơn nữa"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr "im lặng hơn nữa"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn"
msgid "update the index with reused conflict resolution if possible"
msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "HEAD được tách rời tại "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "HEAD được tách rời từ "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Thêm nội dung tập tin vào bảng mục lục"
msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "Hoàn nguyên các tập tin cây làm việc"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "Hoàn lại một số lần chuyển giao sẵn có"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "Cậy ra và xử lý các tham số"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "Gửi một tập hợp của các miếng vá ở dạng thư điện tử"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "Đẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "Kết xuất “git log” dạng tóm tắt"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "Hiển thị các muc lục kho nén đã đóng gói"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ vỏ"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "Mã cài đặt văn lệnh hệ vỏ Git chung"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "Hiển thị trạng thái cây làm việc"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "Xóa bỏ các khoảng trắng không cần thiết"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "Khởi tạo, cập nhật hay điều tra các mô-đun-con"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Thao tác hai hướng giữ hai kho Subversion và Git"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "Các nhánh chuyển"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "Đọc, sửa và xóa tham chiếu mềm"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "Tạo một tập tin tạm với nội dung của blob"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "Gỡ các đối tượng khỏi một kho lưu đã đóng gói"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "Đăng ký nội dung tập tin từ cây làm việc đến bảng mục lục"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "Cập nhật tên đối tượng được lưu trong một tham chiếu một cách an toàn"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "Cập nhật tập tin thông tin phụ trợ để giúp đỡ các dịch vụ dumb"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "Gửi trở lại kho lưu đến git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "Gửi trở lại các đối tượng đã đóng gói cho git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "Hiển thị một biến Git luận lý"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "Kiểm tra ký lần chuyển giao dùng GPG"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "Kiểm tra lại các tập tin kho (lưu trữ, nén) Git đã được đóng gói"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "Kiểm tra chữ ký GPG của các thẻ"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "Quản lý nhiều cây làm việc"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Giao diện dòng lệnh Git và quy ước"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "Hướng dẫn Git cơ bản cho nhà phát triển"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "Git dành cho những người dùng CVS"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "Chỉnh kết xuất diff"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Các móc được sử dụng bởi Git"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "Định nghĩa thuộc tính mô-đun-con"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Không gian tên Git"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Bố cục kho Git"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "Hướng dẫn cách dùng Git: phần hai"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "Hướng dẫn cách dùng Git"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git"
msgid "See git-${cmd}(1) for details."
msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Đã áp dụng autostash."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Không thể lưu $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Đang rebase ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới "
"đáy.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Chuyển-tiếp-nhanh đến $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Không thể di chuyển HEAD đến $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Từ chối squash lần hòa trộn: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "Không thể lấy ra $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị bỏ qua:"
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Đây là tổ hợp của $count lần chuyển giao."
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Không thể $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "Đây là tổ hợp của 2 lần chuyển giao."
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Không thể áp dụng $sha1… $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"này\n"
"trước khi bạn có thể làm việc lại với lần chuyển giao."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Bị dừng tại $sha1_abbrev… $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Không “$squash_style” thể mà không có lần chuyển giao kế trước"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "Thực thi: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "Thực thi gặp lỗi: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Lệnh chưa biết: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Cài tổ và cập nhật $head_name một cách thành công."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
"nữa."
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "Không thể thực thi trình biên soạn"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Không thể checkout $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "Không HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Không thể tạo thư mục tạm thời $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "Không thể đánh dấu là tương tác"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "đã đưa lên bệ phóng"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "nhị phân"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "không có gì"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "không thay đổi"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "đã thêm %d đường dẫn\n"
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "đã cập nhật %d đường dẫn\n"
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "đã hoàn nguyên %d đường dẫn\n"
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d đường dẫn đã touch (chạm)\n"
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "Cập nhật"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "Hoàn nguyên"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Thêm các cái chưa được theo dõi"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "Không có tập tin nào chưa được theo dõi.\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để chuyển lên bệ phóng."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để tạm cất."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để bỏ chuyển lên bệ phóng."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để áp dụng."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-"Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để loại bỏ."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
-msgstr "gặp lỗi khi tập tin sửa hunk để ghi: %s"
+msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Chế độ sửa hunk bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
+msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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ếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n"
-"để sửa lần nữa. Nếu mọi dòng của hunk bị xóa bỏ, thế thì những\n"
-"sửa dổi sẽ bị loại bỏ, và hunk vẫn giữ nguyên.\n"
+"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n"
+"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
-msgstr "gặp lỗi khi mở tập tin hunk để đọc: %s"
+msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. 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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
"bỏ!) [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-"y - đưa lên bệ phóng hunk này\n"
-"n - đừng đưa lên bệ phóng hunk này\n"
-"q - thoát; đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - đưa lên bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng đưa lên bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong tập "
+"y - đưa lên bệ phóng khúc này\n"
+"n - đừng đưa lên bệ phóng khúc này\n"
+"q - thoát; đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - đưa lên bệ phóng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-"y - tạm cất hunk này\n"
-"n - đừng tạm cất hunk này\n"
-"q - thoát; đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - tạm cất hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng tạm cất hunk này cũng như bất kỳ cái nào còn lại trong tập tin"
+"y - tạm cất khúc này\n"
+"n - đừng tạm cất khúc này\n"
+"q - thoát; đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-"y - đưa ra khỏi bệ phóng hunk này\n"
-"n - đừng đưa ra khỏi bệ phóng hunk này\n"
-"q - thoát; đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn "
+"y - đưa ra khỏi bệ phóng khúc này\n"
+"n - đừng đưa ra khỏi bệ phóng khúc này\n"
+"q - thoát; đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn "
"lại\n"
-"a - đưa ra khỏi bệ phóng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng đưa ra khỏi bệ phóng hunk này cũng như bất kỳ cái nào còn lại trong "
+"a - đưa ra khỏi bệ phóng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - áp dụng hunk này vào mục lục\n"
-"n - đừng áp dụng hunk này vào mục lục\n"
-"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - áp dụng khúc này vào mục lục\n"
+"n - đừng áp dụng khúc này vào mục lục\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - loại bỏ hunk này khỏi cây làm việc\n"
-"n - đừng loại bỏ hunk khỏi cây làm việc\n"
-"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - loại bỏ khúc này khỏi cây làm việc\n"
+"n - đừng loại bỏ khúc khỏi cây làm việc\n"
+"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-"y - loại bỏ hunk này khỏi mục lục và cây làm việc\n"
-"n - đừng loại bỏ hunk khỏi mục lục và cây làm việc\n"
-"q - thoát; đừng loại bỏ hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - loại bỏ hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng loại bỏ hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - loại bỏ khúc này khỏi mục lục và cây làm việc\n"
+"n - đừng loại bỏ khúc khỏi mục lục và cây làm việc\n"
+"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-"y - áp dụng hunk này vào mục lục và cây làm việc\n"
-"n - đừng áp dụng hunk vào mục lục và cây làm việc\n"
-"q - thoát; đừng áp dụng hunk này cũng như bất kỳ cái nào còn lại\n"
-"a - áp dụng hunk này và tất cả các hunk sau này trong tập tin\n"
-"d - đừng áp dụng hunk này cũng như bất kỳ cái nào sau này trong tập tin"
+"y - áp dụng khúc này vào mục lục và cây làm việc\n"
+"n - đừng áp dụng khúc vào mục lục và cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
+
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - áp dụng khúc này vào cây làm việc\n"
+"n - đừng áp dụng khúc vào cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
+"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"g - chọn một hunk muốn tới\n"
-"/ - tìm một hunk khớp với biểu thức chính quy đưa ra\n"
-"j - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế\n"
-"J - để lại hunk này là chưa quyết định, xem hunk kế\n"
-"k - để lại hunk này là chưa quyết định, xem hunk chưa quyết định kế trước\n"
-"K - để lại hunk này là chưa quyết định, xem hunk kế trước\n"
-"s - chia hunk hiện tại thành các hunk nhỏ hơn\n"
-"e - sửa bằng tay hunk hiện hành\n"
+"g - chọn một khúc muốn tới\n"
+"/ - tìm một khúc khớp với biểu thức chính quy đưa ra\n"
+"j - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế\n"
+"J - để lại khúc này là chưa quyết định, xem khúc kế\n"
+"k - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế trước\n"
+"K - để lại khúc này là chưa quyết định, xem khúc kế trước\n"
+"s - chia khúc hiện tại thành các khúc nhỏ hơn\n"
+"e - sửa bằng tay khúc hiện hành\n"
"? - in trợ giúp\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
-msgstr "Các hunk đã chọn không được áp dụng vào bảng mục lục!\n"
+msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "Đã không áp dụng gì cả.\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Đưa lên bệ phóng hunk này [y,n,q,a,d%s,?]? "
+msgstr "Đưa lên bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Tạm cất hunk này [y,n,q,a,d%s,?]? "
+msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Bỏ ra khỏi bệ phóng hunk này [y,n,q,a,d%s,?]? "
+msgstr "Bỏ ra khỏi bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Áo dụng hunk này vào mục lục [y,n,q,a,d%s,?]? "
+msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Loại bỏ hunk này khỏi cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Loại bỏ hunk này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Áp dụng hunk này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
-msgstr "Không còn hunk nào để mà nhảy đến\n"
+msgstr "Không còn khúc nào để mà nhảy đến\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
-msgstr "nhảy đến hunk nào (<ret> để xem thêm)? "
+msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
-msgstr "nhảy đến hunk nào? "
+msgstr "nhảy đến khúc nào? "
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Số không hợp lệ: “%s”\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] "Rất tiếc, chỉ có sẵn %d hunk..\n"
+msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
-msgstr "Không còn hunk nào để mà tìm kiếm\n"
+msgstr "Không còn khúc nào để mà tìm kiếm\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
-msgstr "tìm kiếm cho regex? "
+msgstr "tìm kiếm cho biểu thức chính quy? "
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
-msgstr "Không thấy hunk nào khớp mẫu đã cho\n"
+msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
-msgstr "Không có hunk kế trước\n"
+msgstr "Không có khúc kế trước\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
-msgstr "Không có hunk kế tiếp\n"
+msgstr "Không có khúc kế tiếp\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
-msgstr "Rất tiếc, không thể chia nhỏ hunk này\n"
+msgstr "Rất tiếc, không thể chia nhỏ khúc này\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
-msgstr[0] "Chi nhỏ thành %d hunks.\n"
+msgstr[0] "Chi nhỏ thành %d khúc.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
-msgstr "Rất tiếc, không thể sửa hunk này\n"
+msgstr "Rất tiếc, không thể sửa khúc này\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "Xem xét lại diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"đặt lên bệ phóng\n"
"revert - hoàn nguyên tập hợp các thay đổi đã đặt lên bệ phóng trở lại "
"phiên bản HEAD\n"
-"patch - cậy các hunk và cập nhật có lựa chọn\n"
+"patch - cậy các khúc và cập nhật có lựa chọn\n"
"diff\t - xem khác biệt giữa HEAD và mục lục\n"
"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
"thay đổi đã đặt lên bệ phóng\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "thiếu --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "không hiểu chế độ --patch: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "đối số không hợp lệ %s, cần --"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases xung khắc với các tùy chọn khác\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
"“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng "
"lệnh hoặc tùy chọn cấu hình)\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Không hiểu trường --suppress-cc: “%s”\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Không hiểu cài đặt --confirm: “%s”\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n"
" * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Gặp lỗi khi mở thư mục “%s”: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"nghiêm trọng: %s: %s\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"Chưa chỉ định các tập tin miếng vá!\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "Không có dòng chủ đề trong %s?"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Gặp lỗi khi mở “%s” để ghi: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Gặp lỗi khi mở “%s”: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Gặp lỗi khi mở %s.final: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Bạn có chắc muốn dùng <%s> [y/N]? "
-#: git-send-email.perl:886
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
"Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự "
"muốn gửi.\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Tới người mà thư được gửi (nếu có)?"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? "
-#: git-send-email.perl:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %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:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): "
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Đường dẫn CA “%s” không tồn tại"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "Gửi thư này trả lời yêu cầu"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS gặp lỗi! %s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-"
"debug."
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "Gặp lỗi khi gửi %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Thử gửi %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "Gửi %s\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "Kết quả: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "Kết quả: Tốt\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "không thể mở tập tin “%s”"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Thêm cc: %s từ dòng “%s”\n"
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi “%s”"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "không thể lấy gửi thư dạng 7 bít"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "bảng mã truyền không hợp lệ"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
+#~ msgid ""
+#~ "Fetch normally indicates which branches had a forced update, but that "
+#~ "check has been disabled."
+#~ msgstr ""
+#~ "Lấy về bình thường cho biết các các nhánh nào buộc phải cập nhật, nhưng "
+#~ "việc kiểm tra đã bị vô hiệu hóa."
+
+#~ msgid ""
+#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
+#~ msgstr ""
+#~ "hoặc chạy 'git config fetch.showForcedUpdates false' để tránh kiểm tra "
+#~ "này.\n"
+
+#~ msgid ""
+#~ "log.mailmap is not set; its implicit value will change in an\n"
+#~ "upcoming release. To squelch this message and preserve current\n"
+#~ "behaviour, set the log.mailmap configuration value to false.\n"
+#~ "\n"
+#~ "To squelch this message and adopt the new behaviour now, set the\n"
+#~ "log.mailmap configuration value to true.\n"
+#~ "\n"
+#~ "See 'git help config' and search for 'log.mailmap' for further "
+#~ "information."
+#~ msgstr ""
+#~ "log.mailmap không được đặt; giá trị ngầm của nó sẽ thay đổi trong một\n"
+#~ "phát hành sắp tới. Để chấm dứt thông báo này và duy trì hành xử\n"
+#~ "hiện tại, đặt giá trị cấu hình log.mailmap thành false.\n"
+#~ "\n"
+#~ "Để làm chấm dứt thông báo này và áp cách hành xử mới, hãy đặt\n"
+#~ "giá trị cấu hình log.mailmap true.\n"
+#~ "\n"
+#~ "Xem 'git help config ' và tìm kiếm ' log.mailmap ' để biết thêm thông tin."
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Máy chủ hỗ trợ multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Máy chủ hỗ trợ no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Máy chủ hỗ trợ multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Máy chủ hỗ trợ side-band-64k"
+
+#~ msgid "Server supports side-band"
+#~ msgstr "Máy chủ hỗ trợ side-band"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
+
+#~ msgid "Server supports ofs-delta"
+#~ msgstr "Máy chủ hỗ trợ ofs-delta"
+
+#~ msgid "(HEAD detached at %s)"
+#~ msgstr "(HEAD được tách rời tại %s)"
+
+#~ msgid "(HEAD detached from %s)"
+#~ msgstr "(HEAD được tách rời từ %s)"
+
+#~ msgid "Checking out files"
+#~ msgstr "Đang lấy ra các tập tin"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối."
+
+#~ msgid "failed to open '%s'"
+#~ msgstr "gặp lỗi khi mở “%s”"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
+
+#~ msgid ""
+#~ "If you wish to skip this commit, use:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+#~ "the remaining commits.\n"
+#~ msgstr ""
+#~ "Nếu bạn muốn bỏ qua lần chuyển giao này thì dùng:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Thế thì \"git cherry-pick --continue\" sẽ phục hồi lại việc cherry-pick\n"
+#~ "những lần chuyển giao còn lại.\n"
+
+#~ msgid "unrecognized verb: %s"
+#~ msgstr "verb không được thừa nhận: %s"
+
#~ msgid "hash version %X does not match version %X"
#~ msgstr "phiên bản băm “%X” không có phiên bản khớp %X"
#~ msgstr ""
#~ "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…"
-#, fuzzy
-#~ msgid "--reschedule-failed-exec requires an interactive rebase"
-#~ msgstr "%s cần một cải tổ kiểu tương tác"
-
#~ msgid "ignoring unknown color-moved-ws mode '%s'"
#~ msgstr "bỏ qua chế độ color-moved-ws chưa biết “%s”"
#~ msgid "cannot remove a locked working tree"
#~ msgstr "không thể gỡ bỏ một cây-làm-việc bị khóa"
-#~ msgid "Applied autostash."
-#~ msgstr "Đã áp dụng autostash."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Không thể lưu $stash_sha1"
-
#~ msgid ""
#~ "\n"
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-04 09:04+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"PO-Revision-Date: 2019-08-13 21:16+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:103
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:156
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:158
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:160
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:162
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:164
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:166
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:174
+#: advice.c:180
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."
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:182
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:189
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:190
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:196
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
"\n"
msgstr ""
-"注意：正在检出 '%s'。\n"
+"注意：正在切换到 '%s'。\n"
+"\n"
+"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以在切换\n"
+"回一个分支时，丢弃在此状态下所做的提交而不对分支造成影响。\n"
"\n"
-"您正处于分离头指针状态。您可以查看、做试验性的修改及提交，并且您可以通过另"
-"外\n"
-"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
+"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在 switch 命令\n"
+"中添加参数 -c 来实现（现在或稍后）。例如：\n"
"\n"
-"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
-"参数 -b 来实现（现在或稍后）。例如：\n"
+" git switch -c <新分支名>\n"
"\n"
-" git checkout -b <新分支名>\n"
+"或者撤销此操作：\n"
+"\n"
+" git switch -\n"
+"\n"
+"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
"\n"
#: alias.c:50
msgid "unclosed quote"
msgstr "未关闭的引号"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同时使用。"
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:950
+#: apply.c:922
#, 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:956
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:957
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1482
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1551
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1571
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1584
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1772
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1774
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1808
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1845
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1847
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1850
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1997
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2034
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2196
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2282
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2286
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2945
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3066
+#: apply.c:3046
#, 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:3078
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3084
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"当查询：\n"
"%.*s"
-#: apply.c:3106
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3114
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3161
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3171
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3179
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3197
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
-#: apply.c:3210
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3216
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3237
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3360
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3420
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3579
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3582
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3614
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3628
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3633
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3659
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3732
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3734
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3943
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3946
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3966
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3971
+#: apply.c:3951
#, 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:3991
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3995
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4010
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4102
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4109
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4112
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: apply.c:4121
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4131
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4269
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4303
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4309
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4317
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4366
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4370
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4440
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4538
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4546
+#: apply.c:4526
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4549
+#: apply.c:4529
#, 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:4560
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4582
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4586
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4696
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4704
+#: apply.c:4684
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4724
+#: apply.c:4704
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4879
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4906
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4920
+#: apply.c:4900
#, 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:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "路径"
-#: apply.c:4964
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4967
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "数字"
-#: apply.c:4970
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4973
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4975
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4979
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4981
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4983
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4985
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4987
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:4989
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4991
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4994
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:4996
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:4998
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5003
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "动作"
-#: apply.c:5005
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5008 apply.c:5011
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5014
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5016
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5018
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5020
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5023
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5026
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "根目录"
-#: apply.c:5029
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
msgid "not a tree object: %s"
msgstr "不是一个树对象：%s"
-#: archive.c:424
+#: archive.c:426
msgid "current working directory is untracked"
msgstr "当前工作目录未被跟踪"
-#: archive.c:455
+#: archive.c:457
msgid "fmt"
msgstr "格式"
-#: archive.c:455
+#: archive.c:457
msgid "archive format"
msgstr "归档格式"
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "前缀"
-#: archive.c:457
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "文件"
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:461
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:462
+#: archive.c:464
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:463
+#: archive.c:465
msgid "store only"
msgstr "只存储"
-#: archive.c:464
+#: archive.c:466
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:472
+#: archive.c:474
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:475
+#: archive.c:477
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "仓库"
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "命令"
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:487
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:489
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:491
+#: archive.c:493
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:513
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:520
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路径太长（%d 字符，SHA1：%s）：%s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:1794
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:1808
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:1829
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
-#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:1856
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:1867
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:1878
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:359
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:382
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:194
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr "需要一个仓库来校验一个包"
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用："
msgstr[1] "这个包中含有 %d 个引用："
-#: bundle.c:201
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
-#: bundle.c:203
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："
-#: bundle.c:269
+#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "无法复制 bundle 描述符"
-#: bundle.c:276
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:287
+#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:329
+#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:378
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:465
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:475
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:500
+#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack 终止"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交！"
-#: commit.c:193
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1128
+#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1131
+#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1134
+#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1137
+#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1391
+#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
-#: commit-graph.c:105
+#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "提交图形文件太小"
-#: commit-graph.c:170
+#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "提交图形签名 %X 和签名 %X 不匹配"
-#: commit-graph.c:177
+#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "提交图形版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:184
+#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
-#: commit-graph.c:207
+#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr "提交图形块查找表条目丢失，文件可能不完整"
-#: commit-graph.c:218
+#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "提交图形不正确的块偏移 %08x%08x"
-#: commit-graph.c:255
+#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "提交图形块 id %08x 出现了多次"
-#: commit-graph.c:390
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交图形没有基础图形块"
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
+msgstr "提交图形链不匹配"
+
+#: commit-graph.c:404
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr "无法找到所有提交图形文件"
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "无效的提交位置。提交图形可能已损坏"
+
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
-#: commit-graph.c:765
+#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
-#: commit-graph.c:781
+#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
-#: commit-graph.c:793
+#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
-#: commit-graph.c:813
+#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
-#: commit-graph.c:930
+#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
-#: commit-graph.c:943
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
-#: commit-graph.c:945
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
-#: commit-graph.c:959
+#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "正在从 %d 个引用中查找提交图的提交"
msgstr[1] "正在从 %d 个引用中查找提交图的提交"
-#: commit-graph.c:991
+#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
-#: commit-graph.c:1004
+#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "正在计算提交图中不同的提交"
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "提交图格式不能写入 %d 个提交"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "æ\8f\90交太å¤\9aä¸\8dè\83½ç\94»å\9b¾"
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr "æ\97 æ³\95å\86\99å\85¥æ£ç¡®æ\95°é\87\8fç\9a\84å\9fºç¡\80å\9b¾å½¢ ID"
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
-#: commit-graph.c:1097
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能创建 '%s'"
+
+#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
-#: commit-graph.c:1162
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr "无法打开提交图形链文件"
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr "无法重命名基础提交图形文件"
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr "无法重命名临时提交图形文件"
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr "正在扫描合并提交"
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "意外的重复提交 ID %s"
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr "正在合并提交图形"
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr "提交图格式不能写入 %d 个提交"
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr "提交太多不能画图"
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误，可能已经损坏"
-#: commit-graph.c:1172
+#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-#: commit-graph.c:1189
+#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
-#: commit-graph.c:1206
+#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
-#: commit-graph.c:1219
+#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
-#: commit-graph.c:1226
+#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-#: commit-graph.c:1236
+#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
-#: commit-graph.c:1242
+#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
-#: commit-graph.c:1255
+#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
-#: commit-graph.c:1260
+#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-#: commit-graph.c:1264
+#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-#: commit-graph.c:1279
+#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
-#: commit-graph.c:1285
+#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%2$s\n"
"这可能是因为循环包含。"
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称：%s"
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:378 sequencer.c:2459
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名（有换行符）：%s"
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数：%s"
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr "超出范围"
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:963
+#: config.c:998
#, 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:966
+#: config.c:1001
#, 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:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:972
+#: config.c:1007
#, 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:975
+#: config.c:1010
#, 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:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录：'%s'"
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围：%d"
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1395
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1421
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1422
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1604
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1607
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1624
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1654
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1710
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2059
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2229
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2272
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: config.c:2298
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2344
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2346
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2427
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2459
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2488
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2740 config.c:3064
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2751
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2786 builtin/config.c:328
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:2811
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2824 config.c:3077
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2835
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2844 config.c:3082
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2929 config.c:3179
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:2963
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3055
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3222
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:97
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:117
+#: connected.c:118
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:124
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛，结束。\n"
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4210
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4555
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4558
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4636
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4684
+#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
-#: diff.c:4721
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4806
+#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4830
+#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4844
+#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4894 diff.c:4900
+#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4912
+#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:4933
+#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:4952
+#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:4992
+#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5186
+#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5242
+#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5265
+#: diff.c:5270
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5267 diff.c:5273
+#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
-#: diff.c:5276 diff.c:5279
+#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5281
+#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5284
+#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5288
+#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5292
+#: diff.c:5297
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5295
+#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5297 diff.c:5305
+#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5298
+#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5302
+#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5306
+#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5310
+#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5313
+#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5316
+#: diff.c:5321
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5319
+#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5321
+#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5322
+#: diff.c:5327
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5325
+#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5328
+#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5331
+#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5333
+#: diff.c:5338
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5334
+#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5337
+#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5340
+#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5343
+#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5345
+#: diff.c:5350
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5346
+#: diff.c:5351
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5347
+#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5350
+#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5354
+#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5357
+#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5360
+#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5363
+#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5366
+#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5371
+#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5376
+#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5381
+#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5384
+#: diff.c:5389
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5385
+#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5386
+#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5390
+#: diff.c:5395
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5394
+#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5397
+#: diff.c:5402
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5401
+#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5403
+#: diff.c:5408
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5406
+#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5408
+#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5411
+#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5413
+#: diff.c:5418
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5415
+#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5418
+#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5421
+#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5424
+#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5427
+#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5430
+#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5433
+#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
-#: diff.c:5436
+#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
-#: diff.c:5440
+#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
-#: diff.c:5442
+#: diff.c:5447
msgid "<algorithm>"
msgstr "<算法>"
-#: diff.c:5443
+#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
-#: diff.c:5445
+#: diff.c:5450
msgid "<text>"
msgstr "<文本>"
-#: diff.c:5446
+#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5449
+#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5452
+#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5455
+#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5458
+#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5461
+#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5464
+#: diff.c:5469
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5466
+#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5470
+#: diff.c:5475
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5472
+#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5474
+#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5476
+#: diff.c:5481
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5478
+#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5480
+#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5482
+#: diff.c:5487
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5483
+#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5486
+#: diff.c:5491
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5487
+#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5491
+#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5494
+#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5496
+#: diff.c:5501
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5497
+#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5500
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5503
+#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5506
+#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5509
+#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5510
+#: diff.c:5515
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5511
+#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5513
+#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5514
+#: diff.c:5519
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5516
+#: diff.c:5521
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5517
+#: diff.c:5522
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6150
+#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:6153
+#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:6156
+#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "完成"
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "服务器不支持 shalllow 客户端"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "服务器支持 multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "服务器支持 no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "服务器支持 multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "服务器支持 side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "服务器支持 side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "服务器支持 allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "服务器支持 allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "服务器支持 ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "服务器支持 filter"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#, c-format
+msgid "Server supports %s"
+msgstr "服务器支持 %s"
+
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
+msgstr "服务器不支持 shalllow 客户端"
+
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1001
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1138
+#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1157
+msgid "Server supports filter"
+msgstr "服务器支持 filter"
+
+#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1189
+#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1195
+#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1234
+#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1249
+#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1251
+#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1293
+#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1340
+#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1345
+#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1350
+#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1676
+#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:318
+#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
-#: gpg-interface.c:344
+#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:347
+#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:2113
+#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2141
+#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令："
-#: help.c:363 git.c:97
+#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 过滤器支持已被删除"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "无效的过滤器表达式 '%s'"
+
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "无法修改部分克隆的 promisor 远程仓库"
msgid "failed to read the cache"
msgstr "读取缓存失败"
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
msgid "error building trees"
msgstr "创建树出错"
-#: merge-recursive.c:861
+#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
-#: merge-recursive.c:872
+#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:895
+#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:939
+#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:963
+#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败：%s"
-#: merge-recursive.c:974
+#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败：%s"
-#: merge-recursive.c:979
+#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s （没有检出）"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s（提交不存在）"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s （提交未跟随合并基线）"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交："
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s（非快进）"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案：\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"以接受此建议。\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s （发现多个合并）"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1385
+#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
-#: merge-recursive.c:1457
+#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1462
+#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1469
+#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1474
+#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1511
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
-#: merge-recursive.c:1599
+#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
-#: merge-recursive.c:1657
+#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
-#: merge-recursive.c:1711
+#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1825
+#: merge-recursive.c:1828
#, 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:2030
+#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:2062
+#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
"在：%s。"
-#: merge-recursive.c:2072
+#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
"径放置于此：%s"
-#: merge-recursive.c:2164
+#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:2408
+#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-#: merge-recursive.c:2929
+#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3005
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3017
msgid "content"
msgstr "内容"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3021
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3170
+#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
msgstr ""
"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-#: merge-recursive.c:3173
+#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
"到 %s。"
-#: merge-recursive.c:3177
+#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
"动到 %5$s。"
-#: merge-recursive.c:3180
+#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
"建议将其移动到 %5$s。"
-#: merge-recursive.c:3294
+#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3326
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3331
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3329
+#: merge-recursive.c:3338
#, 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:3338
+#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您对下列文件的本地修改将被合并操作覆盖：\n"
" %s"
-#: merge-recursive.c:3396
+#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:3405
+#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3513
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3517
+#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3556
+#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: midx.c:66
+#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:82
+#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:87
+#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:92
+#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "散列版本 %u 不匹配"
-#: midx.c:106
+#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "无效的块偏移（太大）"
-#: midx.c:130
+#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "终止多包索引块 id 出现时间早于预期"
-#: midx.c:143
+#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:145
+#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:147
+#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:149
+#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:163
+#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:208
+#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:258
+#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:286
+#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "从多包索引准备 packfile 出错"
-#: midx.c:457
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:463
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:557
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:993
+#: midx.c:865
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到要丢弃的包文件 %s"
+
+#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:1048
+#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1063
+#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1067
+#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "正在校验 MIDX 中的对象 ID 顺序"
-#: midx.c:1076
+#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1095
+#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1101
+#: midx.c:1144
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1117
+#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1123
+#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1132
+#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: name-hash.c:531
+#: midx.c:1350
+msgid "could not start pack-objects"
+msgstr "不能开始 pack-objects"
+
+#: midx.c:1369
+msgid "could not finish pack-objects"
+msgstr "不能结束 pack-objects"
+
+#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "不能创建 lazy_dir 线程：%s"
-#: name-hash.c:553
+#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "不能创建 lazy_name 线程：%s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 线程：%s"
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: packfile.c:617
+#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:1868
+#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1872
+#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: range-diff.c:56
+#: range-diff.c:70
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:59
+#: range-diff.c:72
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:224
+#: range-diff.c:117
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "无法解析 git 头 '%.*s'"
+
+#: range-diff.c:274
msgid "failed to generate diff"
msgstr "生成 diff 失败"
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
msgstr "'%s' 的未排序暂存条目"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "索引文件损坏"
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
msgstr[0] "变基 %s 到 %s（%d 个提交）"
msgstr[1] "变基 %s 到 %s（%d 个提交）"
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
"可选值有：ignore、warn、error。\n"
"\n"
-#: refs.c:192
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象！"
-#: refs.c:597
+#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
-#: refs.c:599 ref-filter.c:1982
+#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: refs.c:734
+#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "无法为写入打开 '%s'：%s"
-#: refs.c:744 refs.c:795
+#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "无法读取引用 '%s'"
-#: refs.c:750
+#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "引用 '%s' 已经存在"
-#: refs.c:755
+#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "写入 '%s' 时意外的对象 ID"
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:797
+#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "删除 '%s' 时意外的对象 ID"
-#: refs.c:928
+#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
-#: refs.c:934
+#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
-#: refs.c:993
+#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
-#: refs.c:1085
+#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
-#: refs.c:1161
+#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-#: refs.c:1942
+#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
-#: refs.c:1974
+#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs.c:2070 refs.c:2100
+#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在，无法创建 '%s'"
-#: refs.c:2076 refs.c:2111
+#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
msgid "invalid refspec '%s'"
msgstr "无效的引用表达式：'%s'"
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "丢失"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "领先 %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "落后 %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:138
+#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:140
+#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:223
+#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:245
+#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "未能识别的 %%(objectsize) 参数：%s"
-#: ref-filter.c:253
+#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
-#: ref-filter.c:265
+#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:274
+#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:296
+#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:325
+#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:342
+#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
-#: ref-filter.c:346
+#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:376
+#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:388
+#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:395
+#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:404
+#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:412
+#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:430
+#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:531
+#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:558
+#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:562
+#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"
-#: ref-filter.c:686
+#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:749
+#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:751
+#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:753
+#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:783
+#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:785
+#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:800
+#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:857
+#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "（非分支，正变基 %s）"
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "（非分支，正变基分离头指针 %s）"
-
-#: ref-filter.c:1459
+#: ref-filter.c:1485
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "（非分支，二分查找开始于 %s）"
+msgid "no branch, rebasing %s"
+msgstr "非分支，正变基 %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1467
+#: ref-filter.c:1488
#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "（头指针分离于 %s）"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "非分支，正变基分离头指针 %s"
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1474
+#: ref-filter.c:1491
#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "（头指针分离自 %s）"
+msgid "no branch, bisect started on %s"
+msgstr "非分支，二分查找开始于 %s"
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "（非分支）"
+#: ref-filter.c:1501
+msgid "no branch"
+msgstr "非分支"
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1522
+#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1888
+#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:1977
+#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2263
+#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2363
+#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "选项 `%s' 和 --merged 不兼容"
-#: ref-filter.c:2366
+#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "选项 `%s' 和 --no-merged 不兼容"
-#: ref-filter.c:2376
+#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
-#: revision.c:2476
+#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2479
+#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2679
+#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
-#: revision.c:2683
+#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:318
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "无法删除 '%s'"
+
+#: sequencer.c:321
msgid "revert"
msgstr "还原"
-#: sequencer.c:320
+#: sequencer.c:323
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:322
+#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:324
+#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:382
+#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:385
+#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:405
+#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: sequencer.c:459
+#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:463
+#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:495
+#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:629
+#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:646
+#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:660
+#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:740
+#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:751
+#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:798
+#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:803
+#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:808
+#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:812
+#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:817
+#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:819
+#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:821
+#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:881
+#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "'%2$s' 中无效的日期格式 '%1$s'"
-#: sequencer.c:898
+#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:992
+#: sequencer.c:995
msgid "writing root commit"
msgstr "写根提交"
-#: sequencer.c:1213
+#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1220
+#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1277
+#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1323
+#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1325
+#: sequencer.c:1328
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1329
+#: sequencer.c:1332
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1350
+#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
-#: builtin/merge.c:906
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1523
+#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1669
+#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1679
+#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1694
+#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1701
+#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1707
+#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1795
+#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1802
+#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1821
+#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1843
+#: sequencer.c:1846
#, 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:1862
+#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1927
+#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1982
+#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1983
+#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:2042
+#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2049
+#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2118
+#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2127
+#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2164
+#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:2226
+#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2237
+#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:2360
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
+msgstr "正在取消一个进行中的拣选"
+
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
+msgstr "正在取消一个进行中的还原"
+
+#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2362
+#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2367
+#: sequencer.c:2371
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2378
+#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2380
+#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2462
+#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2549
+#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2565
+#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "一个拣选或还原操作已在进行"
+#: sequencer.c:2668
+msgid "revert is already in progress"
+msgstr "一个还原操作已在进行"
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2670
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
+msgstr "拣选操作已在进行"
+
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2660
+#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2674
+#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2731
+#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2756
+#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:2757
+#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2763
+#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2774
+#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:2859
+msgid "no revert in progress"
+msgstr "没有正在进行的还原"
+
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
+msgstr "没有正在进行的拣选"
+
+#: sequencer.c:2877
+msgid "failed to skip the commit"
+msgstr "无法跳过这个提交"
+
+#: sequencer.c:2884
+msgid "there is nothing to skip"
+msgstr "没有要跳过的"
+
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"您已经提交了么？\n"
+"试试 \"git %s --continue\""
+
+#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:2966
+#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:2976
+#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:2983
+#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
-#: builtin/rebase.c:1940 builtin/rebase.c:1995
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:3028
+#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3034
+#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3040
+#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3101
+#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3155
+#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3160
+#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
-#: sequencer.c:3216 builtin/rebase.c:863
+#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "不能写入索引"
-#: sequencer.c:3243
+#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3271
+#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3293
+#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3302
+#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3314
+#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3329
+#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3478
+#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3494
+#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3574
+#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3638
+#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "不能检出 %s"
-#: sequencer.c:3652
+#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s：不是一个有效的对象 ID"
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3672
+#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3674
+#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3682
+#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3759
+#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:3882
+#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:3901
+#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:3991
+#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4000
+#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4002
+#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4004
+#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4007
+#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4096
+#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4204
+#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4208
+#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4243
+#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:4686
+#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:4689
+#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:4847
+#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
"或者您可以用 'git rebase --abort' 终止变基。\n"
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:4990
+#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5073
+#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
-#: sha1-file.c:846
+#: sha1-file.c:792
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时无效的行：%s"
+
+#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-#: sha1-file.c:871
+#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap 失败"
-#: sha1-file.c:1035
+#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
-#: sha1-file.c:1203
+#: sha1-file.c:1301
msgid "invalid object type"
msgstr "无效的对象类型"
-#: sha1-file.c:1287
+#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-#: sha1-file.c:1290
+#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
-#: sha1-file.c:1296
+#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-#: sha1-file.c:1299
+#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
-#: sha1-file.c:1490
+#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
-#: sha1-file.c:1494
+#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1498
+#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1502
+#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s（保存在 %s）已损坏"
-#: sha1-file.c:1604
+#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
-#: sha1-file.c:1611
+#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
-#: sha1-file.c:1618
+#: sha1-file.c:1717
msgid "file write error"
msgstr "文件写错误"
-#: sha1-file.c:1637
+#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
-#: sha1-file.c:1702
+#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-#: sha1-file.c:1704
+#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
-#: sha1-file.c:1728
+#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
-#: sha1-file.c:1734
+#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s（%d）"
-#: sha1-file.c:1738
+#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-#: sha1-file.c:1742
+#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
-#: sha1-file.c:1827
+#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
-#: sha1-file.c:1867
+#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "损坏的提交"
-#: sha1-file.c:1875
+#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "损坏的标签"
-#: sha1-file.c:1974
+#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
-#: sha1-file.c:1977
+#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s：插入数据库失败"
-#: sha1-file.c:2065
+#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s：不支持的文件类型"
-#: sha1-file.c:2089
+#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
-#: sha1-file.c:2091
+#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配（预期 %s）"
-#: sha1-file.c:2332
+#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2337
+#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
-#: sha1-file.c:2343
+#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
-#: sha1-file.c:2354
+#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Git é\80\9a常ä¸\8dä¼\9aå\88\9b建ä¸\80个以40ä½\8då\8d\81å\85è¿\9bå\88¶å\97符å\91½å\90\8dç\9a\84å¼\95ç\94¨ï¼\8cå\9b 为å½\93ä½ æ\8f\90ä¾\9b40ä½\8d\n"
-"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"Git é\80\9a常ä¸\8dä¼\9aå\88\9b建ä¸\80个以40个å\8d\81å\85è¿\9bå\88¶å\97符ç»\93å°¾ç\9a\84å¼\95ç\94¨ï¼\8cå\9b 为å½\93æ\82¨å\8fªæ\8f\90ä¾\9b40\n"
+"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
+" git switch -c $br $(git rev-parse ...)\n"
"\n"
-"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
-"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
-"命令关闭本消息通知。"
+"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
+"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
+"false\" 命令关闭本消息通知。"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u 字节"
+msgstr[1] "%u 字节"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u 字节/秒"
+msgstr[1] "%u 字节/秒"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:2008
+#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:2027
+#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:2111
+#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:2155
+#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2194
+#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
-#: transport.c:1326 transport-helper.c:645
+#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析备用引用时无效的行：%s"
-
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "完整写入远程助手失败"
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
-#: transport-helper.c:939
+#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push，需要引用表达式"
-#: transport-helper.c:944
+#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
-#: transport-helper.c:991
+#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
-#: transport-helper.c:996
+#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
-#: transport-helper.c:1021
+#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"没有共同的引用并且也没有指定，什么也不会做。\n"
"可能您应该指定一个分支如 'master'。\n"
-#: transport-helper.c:1085
+#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应：%s"
-#: transport-helper.c:1238
+#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "读取（%s）失败"
-#: transport-helper.c:1265
+#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "写（%s）失败"
-#: transport-helper.c:1314
+#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
-#: transport-helper.c:1318
+#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败：%s"
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据：%s"
-#: transport-helper.c:1378
+#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
-#: transport-helper.c:1382
+#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:116
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "太短的树文件"
#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
-msgstr "终止中\n"
+msgstr "正在终止\n"
#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "æ£å\9c¨æ£\80å\87º文件"
+msgid "Updating files"
+msgstr "æ£å\9c¨æ\9b´æ\96°文件"
#: unpack-trees.c:350
msgid ""
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
-#: worktree.c:255 builtin/am.c:2097
+#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
-#: worktree.c:301
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:312
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:324
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:330
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件，错误码 %d"
-#: worktree.c:338
+#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " （使用 \"git restore --staged <文件>...\" 以取消暂存）"
+
+# 译者：注意保持前导空格
+#: wt-status.c:190 wt-status.c:222
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr " （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:229
+#: wt-status.c:241
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
-msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr " （使用 \"git restore <文件>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: wt-status.c:258
+#: wt-status.c:268
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:260
+#: wt-status.c:270
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:262
+#: wt-status.c:272
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:264
+#: wt-status.c:274
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:266
+#: wt-status.c:276
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:268
+#: wt-status.c:278
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:270
+#: wt-status.c:280
msgid "both modified:"
msgstr "双方修改："
-#: wt-status.c:280
+#: wt-status.c:290
msgid "new file:"
msgstr "新文件："
-#: wt-status.c:282
+#: wt-status.c:292
msgid "copied:"
msgstr "拷贝："
-#: wt-status.c:284
+#: wt-status.c:294
msgid "deleted:"
msgstr "删除："
-#: wt-status.c:286
+#: wt-status.c:296
msgid "modified:"
msgstr "修改："
-#: wt-status.c:288
+#: wt-status.c:298
msgid "renamed:"
msgstr "重命名："
-#: wt-status.c:290
+#: wt-status.c:300
msgid "typechange:"
msgstr "类型变更："
-#: wt-status.c:292
+#: wt-status.c:302
msgid "unknown:"
msgstr "未知："
-#: wt-status.c:294
+#: wt-status.c:304
msgid "unmerged:"
msgstr "未合并："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
+#: wt-status.c:384
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:376
+#: wt-status.c:386
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:378
+#: wt-status.c:388
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:896
+#: wt-status.c:906
#, 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:928
+#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:930
+#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:1012
+#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
-#: wt-status.c:1119
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
+msgstr ""
+"\n"
+"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
+"为避免，您可以使用 '--no-ahead-behind'。\n"
+
+#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1122
+#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1124
+#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1128
+#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1131
+#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1140
+#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1143
+#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1147
+#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1149
+#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1151
+#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1284
+#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1286
+#: wt-status.c:1311
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1289
+#: wt-status.c:1314
#, 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:1300
+#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1305
+#: wt-status.c:1330
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1308
+#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1316
+#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1328
+#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1333
+#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1346
+#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1348
+#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1350
+#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1357
+#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1361
+#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1366
+#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1369
+#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1373
+#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1378
+#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1381
+#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1383
+#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1394
+#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "拣选操作正在进行中。"
-#: wt-status.c:1397
+#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1404
+#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1407
+#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1410
+#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1412
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1422
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
-#: wt-status.c:1425
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1431
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1434
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " （执行 \"git revert --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1437
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1439
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1665
+#: wt-status.c:1690
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1672
+#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1674
+#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
-#: wt-status.c:1684
+#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1701
+#: wt-status.c:1726
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1702
+#: wt-status.c:1727
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1716
+#: wt-status.c:1741
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1718
+#: wt-status.c:1743
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1722
+#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1728
+#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1730
+#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1736
+#: wt-status.c:1761
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1741
+#: wt-status.c:1766
#, 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:1744
+#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1747
+#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1750
+#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1753
+#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1759
+#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1763
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1876
+#: wt-status.c:1901
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:1880
+#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1911
+#: wt-status.c:1936
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2449
+#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2451
+#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "更新文件失败"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "演习"
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
-#: builtin/am.c:1084 builtin/commit.c:371
+#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "无法写入索引文件"
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1495
+#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1497
+#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1516
+#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1522
+#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1548
+#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1580
+#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-
-#: builtin/am.c:1652
+#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1662
+#: builtin/am.c:1660
+#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1712
+#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1775
+#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1779
+#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
-#: builtin/am.c:1823
+#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1830
+#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:1989
+#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2033
+#: builtin/am.c:2031
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:2130
+#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2166
+#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2167
+#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2171
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2175
+#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2177
+#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2180
+#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2183
+#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2185
+#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2187
+#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2189
+#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2191
+#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2194
+#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2197
+#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2223
+#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2229
+#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2231
+#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2234
+#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2237
+#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2240
+#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2243
+#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
-#: builtin/am.c:2246
+#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "显示正在应用的补丁。"
-#: builtin/am.c:2250
+#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2252
+#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2258
+#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2276
+#: builtin/am.c:2274
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."
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2283
+#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2298
+#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2322
+#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2328
+#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
+msgstr "交互式模式需要命令行上提供补丁"
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:627
+#: builtin/bisect--helper.c:574
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "无效的引用：'%s'"
+
+#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
-#: builtin/bisect--helper.c:629
+#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "将术语写入 .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:631
+#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "检查预期的版本"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "将二分查找的状态写入 BISECT_LOG"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "在一个二分查找状态中检查和设置术语"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:666
+#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms 需要两个参数"
-#: builtin/bisect--helper.c:670
+#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state 不带参数"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write 需要 4 或 5 个参数"
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms 需要 3 个参数"
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 个参数"
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:794
+#: builtin/blame.c:823
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "不能找到要忽略的版本 %s"
+
+#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:795
+#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1（默认：关闭）"
-#: builtin/blame.c:796
+#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:797
+#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
-#: builtin/blame.c:798
+#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "强制进度显示"
-#: builtin/blame.c:799
+#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
-#: builtin/blame.c:800
+#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:801
+#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:802
+#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:803
+#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:804
+#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:805
+#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:806
+#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:807
+#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:808
+#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:809
+#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:810
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
+msgstr "版本"
+
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
+msgstr "在执行 blame 操作时忽略 <版本>"
+
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
+msgstr "忽略来自 <文件> 中的版本"
+
+#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:811
+#: builtin/blame.c:864
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:818
+#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
-#: builtin/blame.c:820
+#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:821
+#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:822
+#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "得分"
-#: builtin/blame.c:823
+#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:824
+#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:825
+#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
-#: builtin/blame.c:876
+#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:927
+#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1087
#, 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/blame.c:1077
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "追踪代码行"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:151
+#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:155
+#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:173
+#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:534
+#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:536
+#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:540
+#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:543
+#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:549
+#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:558
+#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:560
+#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:576
+#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:616
+#: builtin/branch.c:624
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:629
+#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:630
+#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:632
+#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:633
+#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:634
+#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:635
+#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:636
+#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:637
+#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:638
+#: builtin/branch.c:646
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:639
+#: builtin/branch.c:647
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:640
+#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:642
+#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:643
+#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:644
+#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:645
+#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:646
+#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:427
+#: builtin/tag.c:433
msgid "object"
msgstr "对象"
-#: builtin/branch.c:650
+#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, 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:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
+"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
+"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:593
+#: builtin/cat-file.c:594
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 | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "不显示进度报告"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
msgid "string"
msgstr "字符串"
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<选项>] [<分支>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
+
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
+#: builtin/checkout.c:374
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "重新创建了 %d 个合并冲突"
+msgstr[1] "重新创建了 %d 个合并冲突"
+
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "从 %2$s 更新了 %1$d 个路径"
+msgstr[1] "从 %2$s 更新了 %1$d 个路径"
+
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "从索引区更新了 %d 个路径"
+msgstr[1] "从索引区更新了 %d 个路径"
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:343 builtin/checkout.c:346
+#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:349
+#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:396 builtin/checkout.c:403
+#: builtin/checkout.c:433
#, c-format
-msgid "path '%s' is unmerged"
-msgstr "路径 '%s' 未合并"
+msgid "neither '%s' or '%s' is specified"
+msgstr "'%s' 或 '%s' 都没有指定"
-#: builtin/checkout.c:442
+#: builtin/checkout.c:437
#, c-format
-msgid "Recreated %d merge conflict"
-msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "重新创建了 %d 个合并冲突"
-msgstr[1] "重新创建了 %d 个合并冲突"
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
-#: builtin/checkout.c:447
+#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
-msgid "Updated %d path from %s"
-msgid_plural "Updated %d paths from %s"
-msgstr[0] "从 %2$s 更新了 %1$d 个路径"
-msgstr[1] "从 %2$s 更新了 %1$d 个路径"
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:454
+#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
-msgid "Updated %d path from the index"
-msgid_plural "Updated %d paths from the index"
-msgstr[0] "从索引区更新了 %d 个路径"
-msgstr[1] "从索引区更新了 %d 个路径"
+msgid "path '%s' is unmerged"
+msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:695
+#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:751
+#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr "下列文件暂存的修改可能会丢失：%s"
-#: builtin/checkout.c:848
+#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:960
+#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
+msgstr "预期只有一个引用"
+
+#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1303
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "期望一个分支，得到标签 '%s'"
+
+#: builtin/checkout.c:1305
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "期望一个分支，得到远程分支 '%s'"
+
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "期望一个分支，得到 '%s'"
+
+#: builtin/checkout.c:1309
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "期望一个分支，得到提交 '%s'"
+
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在合并时切换分支\n"
+"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1329
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在一个 am 会话期间切换分支\n"
+"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在变基时切换分支\n"
+"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在拣选时切换分支\n"
+"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"不能在还原时切换分支\n"
+"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
+msgstr "您在执行二分查找时切换分支"
+
+#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' 不带 <起始点>"
+
+#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "分支"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
+msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "创建并检出一个新的分支"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "å\88\9b建/é\87\8d置并æ£\80å\87ºä¸\80个å\88\86æ\94¯"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
+msgstr "å\92\8cæ\96°ç\9a\84å\88\86æ\94¯æ\89§è¡\8cä¸\89æ\96¹å\90\88并"
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "为新的分支创建引用日志"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
+msgstr "风格"
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
+msgstr "冲突输出风格（merge 或 diff3）"
+
+#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
+msgstr "强制检出（丢弃本地修改）"
+
+#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
+msgstr "更新忽略的文件（默认）"
+
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
+msgstr "不检查指定的引用是否被其他工作区所占用"
+
+#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "强制检出（丢弃本地修改）"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支执行三方合并"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "更新忽略的文件（默认）"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "风格"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "冲突输出风格（merge 或 diff3）"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr "不要二次猜测 'git checkout <无此分支>'"
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "不检查指定的引用是否被其他工作区所占用"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr "使用叠加模式（默认）"
-
-#: builtin/checkout.c:1422
+#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1447
+#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "缺少分支名，尝试 -b"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1611
+#, c-format
+msgid "could not resolve %s"
+msgstr "无法解析 %s"
+
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
+msgstr "您必须指定一个要恢复的路径"
+
+#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1646
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/checkout.c:1519
+#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n"
"仓库名，可以在配置中设置 checkout.defaultRemote=origin。"
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
+msgstr "分支"
+
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
+msgstr "创建并检出一个新的分支"
+
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
+msgstr "创建/重置并检出一个分支"
+
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
+msgstr "为新的分支创建引用日志"
+
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "二次猜测 'git checkout <无此分支>'（默认）"
+
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
+msgstr "使用叠加模式（默认）"
+
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
+msgstr "创建并切换一个新分支"
+
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
+msgstr "创建/重置并切换一个分支"
+
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "二次猜测 'git switch <无此分支>'"
+
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
+msgstr "丢弃本地修改"
+
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
+msgstr "要检出哪一个树"
+
+#: builtin/checkout.c:1774
+msgid "restore the index"
+msgstr "恢复索引"
+
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
+msgstr "恢复工作区（默认）"
+
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
+msgstr "忽略未合并条目"
+
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
+msgstr "使用叠加模式"
+
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgid "failed to remove %s"
msgstr "删除 %s 失败"
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "不能对 %s 调用 lstat\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:661
+#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:719
+#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:785 git-add--interactive.perl:1717
+#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:793
+#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
+#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:821 git-add--interactive.perl:1790
+#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:829
+#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:845
+#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:907
+#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:909
+#: builtin/clean.c:910
msgid "force"
msgstr "强制"
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:912
+#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:914
+#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:917
+#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:935
+#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:939
+#: builtin/clean.c:940
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:942
+#: builtin/clean.c:943
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:44
+#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:95
+#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:97
+#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:99
+#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:101
+#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:107
+#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "名称"
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "时间"
-#: builtin/clone.c:125
+#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:133
+#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:136
+#: builtin/clone.c:139
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:137
+#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:280
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
+
+#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:333
+#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "打开 '%s' 失败"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:427
+#: builtin/clone.c:428
#, c-format
-msgid "failed to stat %s\n"
-msgstr "对 %s 调用 stat 失败\n"
+msgid "failed to start iterator over '%s'"
+msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:444
+#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
-#: builtin/clone.c:449
+#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:453
+#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:479
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "无法在 '%s' 上迭代"
+
+#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:506
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"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"克隆成功，但是检出失败。\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
-"'git checkout -f HEAD' 重试\n"
+"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:689
+#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:739
+#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:770
+#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:815
+#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:878
+#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:880
+#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:924
+#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:937
+#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:940
+#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:953
+#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:969
+#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:979
+#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:999
+#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1108
+#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1110
+#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1112
+#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1115
+#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "提交说明"
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "否则，请使用命令 'git reset'\n"
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "否则，请使用 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
-" git reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
msgstr ""
-"如果您想跳过这个提交，使用命令：\n"
+"然后使用：\n"
+"\n"
+" git cherry-pick --continue\n"
"\n"
-" git reset\n"
+"来继续拣选剩余提交。如果您想跳过此提交，使用：\n"
+"\n"
+" git cherry-pick --skip\n"
"\n"
-"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
-"操作。\n"
-#: builtin/commit.c:312
+#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 树对象失败"
-#: builtin/commit.c:353
+#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:359
+#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:373
+#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:375
+#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:452
+#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:454
+#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:462
+#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:481
+#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:579
+#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:581
+#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:600
+#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:653
+#: 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:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:709
+#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:826
+#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:831
+#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:844
+#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:869
+#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:877
+#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:884
+#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:969
+#: builtin/commit.c:972
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1027
+#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1142
+#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1144
+#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1147
+#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1157
+#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1159
+#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1167
+#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1184
+#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1186
+#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1192
+#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1343
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1327
+#: builtin/commit.c:1347
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1340
+#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1481
+#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1688
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."
+"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
-"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
-"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
+"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n"
+"磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
-#: builtin/commit-graph.c:10
+#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <对象目录>]"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <对象目录>]"
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <对象目录>]"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]"
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
-msgstr ""
-"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
+msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
msgid "dir"
msgstr "目录"
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "保存图形的对象目录"
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "如果提交图形被拆分，只验证头一个文件"
+
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
-#: builtin/commit-graph.c:150
+#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
-#: builtin/commit-graph.c:152
+#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
-#: builtin/commit-graph.c:154
+#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
-#: builtin/commit-graph.c:156
+#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
-#: builtin/commit-graph.c:165
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
+msgstr "允许写一个增量提交图形文件"
+
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "在非基本拆分提交图形中的最大提交数"
+
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "一个拆分提交图形的两个级别之间的最大比率"
+
+#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:103
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数，%s"
msgid "Type"
msgstr "类型"
-#: builtin/config.c:147
+#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "取值为该类型"
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:158
+#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "取值"
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
+
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
+msgstr "类型"
+
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
+msgstr "git_env_*(...) 的默认值"
+
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "安静模式，只使用 git_env_*() 的值作为退出码"
+
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，不是 `%s`"
+
+#: builtin/env--helper.c:77
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不是 `%s`"
+
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "选择使用备用编码处理提交说明"
+
+#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fetch.c:28
+#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:122
+#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:140
+#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:145
+#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:469
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
+msgstr "获取后执行 'gc --auto'"
+
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
+msgstr "在所有更新分支上检查强制更新"
+
+#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:738
+#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:760
+#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:828
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:847
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
+msgstr ""
+"获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用。\n"
+"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
+"'git config fetch.showForcedUpdates true'。"
+
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
+msgstr ""
+"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
+"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
+
+#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1543
+#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "正在检查对象"
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:693
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:646
+#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:712
+#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:811
+#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:822
+#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:833
+#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:844
+#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:847
+#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:850
+#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:853
+#: builtin/grep.c:855
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:854
+#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:865
+#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:870
+#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:873
+#: builtin/grep.c:875
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:880
+#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:883
+#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:888
+#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:891
+#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:896
+#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:912
+#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:920
+#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:924
+#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:988
+#: builtin/grep.c:990
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1115
+#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "选项不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1121
+#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1135
+#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:98
-msgid "type"
-msgstr "类型"
-
#: builtin/hash-object.c:98
msgid "object type"
msgstr "对象类型"
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串：%s"
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:305 builtin/repack.c:250
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
-
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "应用 delta 失败"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1252
#, 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:1263
+#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1643
#, 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:1630
+#: builtin/index-pack.c:1650
#, 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:1667
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:559
#, 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:584
+#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
">])...] [<文件>...]"
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "在原位编辑文件"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "删除空的尾部署名"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "在哪里放置新的尾部署名"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "当尾部署名已经存在时所采取的动作"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "当尾部署名缺失时所采取的动作"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "只输出尾部署名"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "不要应用配置规则"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "连接空白折行的值"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "设置解析选项"
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "不要对 --- 特殊处理"
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "要添加的尾部署名"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer 和 --only-input 同时使用没有意义"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:104
+#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:168
+#: builtin/log.c:173
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:169
+#: builtin/log.c:174
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:171
+#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/log.c:173
+#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
-#: builtin/log.c:275
+#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:663
+#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:784
+#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:885
+#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:901
+#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:918
+#: builtin/log.c:941
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:928
+#: builtin/log.c:951
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1051
+#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1057
+#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1136
+#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1163
+#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1244
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1347
+#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1351
+#: builtin/log.c:1374
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"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1371
+#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1382
+#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1386
+#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1439
+#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1491
+#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "无法推断 range-diff 范围"
-#: builtin/log.c:1536
+#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1539
+#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1543
+#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1545
+#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1547
+#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1548
+#: builtin/log.c:1571
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1549
+#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1551
+#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1553
+#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1555
+#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1564
+#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1569
+#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1571
+#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1573
+#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1575
+#: builtin/log.c:1598
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1576
+#: builtin/log.c:1599
msgid "header"
msgstr "header"
-#: builtin/log.c:1577
+#: builtin/log.c:1600
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1578
+#: builtin/log.c:1601
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1580
+#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1582
+#: builtin/log.c:1605
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1583
+#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1585
+#: builtin/log.c:1608
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1586
+#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1588
+#: builtin/log.c:1611
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1591
+#: builtin/log.c:1614
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1595
+#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1597
+#: builtin/log.c:1620
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1598
+#: builtin/log.c:1621
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1599
+#: builtin/log.c:1622
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1600
+#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1602
+#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1603
+#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1605
+#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr "版本"
-
-#: builtin/log.c:1607
+#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/log.c:1610
+#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/log.c:1612
+#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1687
+#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1702
+#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1704
+#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1712
+#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1714
+#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1716
+#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1748
+#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1837
+#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1841
+#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:1842
+#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:1848
+#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1852
+#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1860
+#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:1861
+#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:1872
+#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1908
+#: builtin/log.c:1931
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:1952
+#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2011
+#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exec"
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:54
+#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:55
+#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:116
+#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
-#: builtin/merge.c:185
+#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:186
+#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:191
+#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:257
+#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:269
+#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:276
+#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:278
+#
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort，但是保留索引和工作区"
+
+#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:286
+#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "校验 commit-msg 钩子"
-#: builtin/merge.c:311
+#: builtin/merge.c:307
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:316
+#: builtin/merge.c:312
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:321
+#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:390
+#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:401
+#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:451
+#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:502
+#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:589
+#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:712
+#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:726
+#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:741
+#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:793
+#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:802
+#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:808
+#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"合并到主题分支。\n"
"\n"
-#: builtin/merge.c:813
+#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
-#: builtin/merge.c:816
+#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-#: builtin/merge.c:857
+#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:876
+#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:936
+#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:975
+#: builtin/merge.c:972
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:977
+#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:979
+#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:984
+#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:1041
+#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1144
+#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1178
+#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1281
+#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1285
+#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1297
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
+msgstr "--quit 不带参数"
+
+#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1301
+#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1317
+#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1324
+#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1327
+#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1341
+#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 与 --no-ff 同时使用。"
+msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-#: builtin/merge.c:1349
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
+msgstr "您不能将 --squash 和 --commit 组合使用。"
+
+#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1366
+#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1368
+#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1373
+#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1375
+#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1463
+#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1473
+#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1515
+#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1547
+#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1646
+#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1648
+#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1657
+#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1669
+#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
msgstr "允许创建一个以上的树"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
-msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)"
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
+msgstr ""
+"git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --"
+"batch-size=<大小>)"
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成对包文件和包索引的对象目录"
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
+
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "太多参数"
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "--batch-size 选项仅用于 'repack' 子命令"
+
+#: builtin/multi-pack-index.c:61
#, c-format
-msgid "unrecognized verb: %s"
-msgstr "æ\9cªè\83½è¯\86å\88«ç\9a\84å\8a¨ä½\9c：%s"
+msgid "unrecognized subcommand: %s"
+msgstr "æ\9cªè¯\86å\88«ç\9a\84å\90å\91½ä»¤：%s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "只打印名称（无 SHA-1）"
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "从标准输入读取"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称（默认）"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签（内部使用）"
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "无效的包文件：%s"
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "无法为重用打开包文件：%s"
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "无法在重用的包文件中查找"
-#: builtin/pack-objects.c:809
+#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "无法读取索引文件"
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:1997
+#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:3247
+#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
+msgstr "如果可能，写 bitmap 索引"
+
+#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "枚举对象"
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:140
+#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:144
+#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:147
+#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:184
+#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:210
+#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:218
+#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:313
+#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:430
+#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:432
+#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:433
+#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:436
+#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:468 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:470
+#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:574
+#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:854
+#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:909
+#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:917
+#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:921
+#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:922
+#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:947
+#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:953
+#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:968
+#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:972
+#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:979
+#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
msgid "keep empty commits"
msgstr "保持空提交"
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
msgid "sign commits"
msgstr "签名提交"
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
msgid "the command to run"
msgstr "要执行的命令"
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s 需要交互式变基"
msgid "Cannot store %s"
msgstr "不能存储 %s"
-#: builtin/rebase.c:817
+#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
-#: builtin/rebase.c:940
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1403
+#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "为每一个提交添加一个 Signed-off-by: 签名"
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "传递给 'git am'"
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1428
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者：注意保持前导空格
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1449
+#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "变基时保留空提交"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
"对 rebase.useBuiltin 的支持已被删除！\n"
"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "无法删除 '%s'"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1796
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
+
+#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr "不能将 am 选项与交互或合并选项同时使用"
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1825
+#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:1968
+#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应：'%s'"
-#: builtin/rebase.c:1977
+#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
-#: builtin/rebase.c:1980
+#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash：%s\n"
-#: builtin/rebase.c:1983
+#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "无法 reset --hard"
-#: builtin/rebase.c:1984 builtin/reset.c:114
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:2027
+#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:832
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"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:200
+#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:256
+#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:294
+#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:296
+#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:299
+#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:303
+#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:305
+#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:310
+#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:312
+#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:313
+#: builtin/repack.c:303
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:314
+#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:316
+#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:318
+#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:320
+#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:322
+#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:324
+#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:326
+#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:328
+#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:330
+#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:340
+#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:344
+#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:423
+#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:484
+#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"警告：并且尝试重命名改回原有文件名的操作也失败。\n"
"警告：请手动将 %s 下的这些文件重命名：\n"
-#: builtin/repack.c:532
+#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "删除 '%s' 失败"
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
-#: builtin/rev-list.c:469
+#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "无效的稀疏值 '%s'"
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:513
+#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "跳过当前提交并继续"
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "不要自动提交"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "编辑提交说明"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "父编号"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "选择主干父提交编号"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "合并策略"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "合并策略的选项"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "追加提交名称"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:240
+#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "拣选失败"
msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "不显示字符串命名"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "包括当前分支"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序，并尽可能地保持日期顺序"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
-#: builtin/show-branch.c:712
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
-#: builtin/show-branch.c:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支，且 HEAD 无效"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
#, 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:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, 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:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s（%s）"
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:817
+#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1568
+#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "不能执行 %s"
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
"对 %s 执行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
"."
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "阻止进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "阻止子模组初始化的输出"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "阻止子模组状态输出"
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "阻止子模组 url 同步的输出"
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
"-rf' 命令）"
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:1876
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
-#: builtin/submodule--helper.c:2060
+#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:278
+#: builtin/tag.c:284
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:285
+#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:402
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:398
+#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:400
+#: builtin/tag.c:406
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:401
+#: builtin/tag.c:407
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:403
+#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:405
+#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:407
+#: builtin/tag.c:413
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:409
+#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
-#: builtin/tag.c:410
+#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:413
+#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:414
+#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:417
+#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:418
+#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:423
+#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:424
+#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:428
+#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:472
+#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:494
+#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:496
+#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:498
+#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:500
+#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:502
+#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:513
+#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:532
+#: builtin/tag.c:542
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:538
+#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:543
+#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:574
+#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <提交>..."
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "打印提交内容"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "打印原始 gpg 状态输出"
msgid "show statistics only"
msgstr "只显示统计"
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "打印标签内容"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
"'%s' 是一个丢失但已经注册的工作区，使用\n"
"'add -f' 覆盖，或 'prune' 或 'remove' 清除"
-#: builtin/worktree.c:302
+#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:673
+#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "目标 '%s' 已存在"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' 是脏的，使用 --force 删除"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
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."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
-"帮助。"
+"帮助。\n"
+"有关系统的概述，查看 'git help git'。"
-#: git.c:185
+#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "没有为 --git-dir 提供目录\n"
-#: git.c:199
+#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
-#: git.c:213
+#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "没有为 --work-tree 提供目录\n"
-#: git.c:227
+#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "没有为 --super-prefix 提供前缀\n"
-#: git.c:249
+#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "应为 -c 提供一个配置字符串\n"
-#: git.c:287
+#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "没有为 -C 提供目录\n"
-#: git.c:313
+#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "未知选项：%s\n"
-#: git.c:359
+#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "在扩展别名 '%s' 时：'%s'"
-#: git.c:368
+#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"别名 '%s' 修改环境变量。您可以使用在别名中\n"
"使用 '!git'"
-#: git.c:376
+#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空别名"
-#: git.c:379
+#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "递归的别名：%s"
-#: git.c:459
+#: git.c:460
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
-#: git.c:461
+#: git.c:462
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
-#: git.c:463
+#: git.c:464
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:797
+#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:847
+#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:860
+#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"用法：%s\n"
"\n"
-#: git.c:880
+#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
-#: git.c:892
+#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败：%s\n"
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
-#: parse-options.h:304
+#: parse-options.h:305
msgid "be more verbose"
msgstr "更加详细"
-#: parse-options.h:306
+#: parse-options.h:307
msgid "be more quiet"
msgstr "更加安静"
-#: parse-options.h:312
+#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
-#: parse-options.h:331
+#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能，重用冲突解决更新索引"
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "添加文件内容至索引"
msgstr "重置当前 HEAD 到指定状态"
#: command-list.h:156
+msgid "Restore working tree files"
+msgstr "恢复工作区文件"
+
+#: command-list.h:157
msgid "Revert some existing commits"
msgstr "回退一些现存提交"
-#: command-list.h:157
+#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "按时间顺序列出提交对象"
-#: command-list.h:158
+#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "选出并处理参数"
-#: command-list.h:159
+#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
-#: command-list.h:160
+#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "通过电子邮件发送一组补丁"
-#: command-list.h:161
+#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 协议推送对象到另一个仓库"
-#: command-list.h:162
+#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允许 Git SSH 访问的受限登录shell"
-#: command-list.h:163
+#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "'git log' 输出摘要"
-#: command-list.h:164
+#: command-list.h:165
msgid "Show various types of objects"
msgstr "显示各种类型的对象"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show branches and their commits"
msgstr "显示分支和提交"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show packed archive index"
msgstr "显示打包归档索引"
-#: command-list.h:167
+#: command-list.h:168
msgid "List references in a local repository"
msgstr "显示本地仓库中的引用"
-#: command-list.h:168
+#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "为 shell 脚本准备的 Git 国际化设置代码"
-#: command-list.h:169
+#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 脚本设置代码"
-#: command-list.h:170
+#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "贮藏脏工作区中的修改"
-#: command-list.h:171
+#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "将文件内容添加到索引"
-#: command-list.h:172
+#: command-list.h:173
msgid "Show the working tree status"
msgstr "显示工作区状态"
-#: command-list.h:173
+#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "删除不必要的空白字符"
-#: command-list.h:174
+#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或检查子模组"
-#: command-list.h:175
+#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subersion 仓库和 Git 之间的双向操作"
-#: command-list.h:176
+#: command-list.h:177
+msgid "Switch branches"
+msgstr "切换分支"
+
+#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "读取、修改和删除符号引用"
-#: command-list.h:177
+#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: command-list.h:178
+#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 数据对象的内容创建一个临时文件"
-#: command-list.h:179
+#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "从打包文件中解压缩对象"
-#: command-list.h:180
+#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "将工作区的文件内容注册到索引"
-#: command-list.h:181
+#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新存储于引用中的对象名称"
-#: command-list.h:182
+#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新辅助信息文件以帮助哑协议服务"
-#: command-list.h:183
+#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "将存档发送回 git-archive"
-#: command-list.h:184
+#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "将对象压缩包发送回 git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "显示一个Git逻辑变量"
-#: command-list.h:186
+#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "检查 GPG 提交签名"
-#: command-list.h:187
+#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "校验打包的Git存仓文件"
-#: command-list.h:188
+#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "检查标签的 GPG 签名"
-#: command-list.h:189
+#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 界面（Git 仓库的 web 前端）"
-#: command-list.h:190
+#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
-#: command-list.h:191
+#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
-#: command-list.h:192
+#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
-#: command-list.h:193
+#: command-list.h:195
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: command-list.h:194
+#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
-#: command-list.h:195
+#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
-#: command-list.h:196
+#: command-list.h:198
msgid "Git for CVS users"
msgstr "适合 CVS 用户的 Git 帮助"
-#: command-list.h:197
+#: command-list.h:199
msgid "Tweaking diff output"
msgstr "调整差异输出"
-#: command-list.h:198
+#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
-#: command-list.h:199
+#: command-list.h:201
msgid "A Git Glossary"
msgstr "Git 词汇表"
-#: command-list.h:200
+#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
-#: command-list.h:201
+#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: command-list.h:202
+#: command-list.h:204
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: command-list.h:203
+#: command-list.h:205
msgid "Git namespaces"
msgstr "Git 名字空间"
-#: command-list.h:204
+#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Git 仓库布局"
-#: command-list.h:205
+#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: command-list.h:206
+#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "一个 Git 教程：第二部分"
-#: command-list.h:207
+#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "一个 Git 教程"
-#: command-list.h:208
+#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
msgid "See git-${cmd}(1) for details."
msgstr "详见 git-${cmd}(1)。"
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "已应用 autostash。"
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "不能存储 $stash_sha1"
+
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "变基中（$new_count/$total）"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"\n"
"可以对这些行重新排序，将从上至下执行。\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1：不是一个可以被拣选的提交"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "无效的提交名：$sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "不能写入当前提交的替代 sha1"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "快进到 $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "不能快进到 $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "不能移动 HEAD 到 $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}："
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "这是一个 $count 个提交的组合。"
msgstr[1] "这是一个 $count 个提交的组合。"
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "执行：$rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败：$rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者：注意保持前导空格
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
msgstr "不能确定 git 目录的绝对路径"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr "缓存"
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "未缓存"
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "二进制"
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "无"
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "没有修改"
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, 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:612
+#: git-add--interactive.perl:626
#, 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:615
+#: git-add--interactive.perl:629
#, 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:618
+#: git-add--interactive.perl:632
#, 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:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "为写入打开块编辑文件失败：%s"
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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"
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在工作区中应用该块\n"
+"n - 不要在工作区中应用该块\n"
+"q - 退出。不要应用该块及后面的全部块\n"
+"a - 应用该块和本文件中后面的全部块\n"
+"d - 不要应用该块和本文件中后面的全部块"
+
+#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "补丁更新"
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, 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:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, 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:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, 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:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, 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:1415
+#: git-add--interactive.perl:1451
#, 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:1416
+#: git-add--interactive.perl:1452
#, 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:1417
+#: git-add--interactive.perl:1453
#, 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:1420
+#: git-add--interactive.perl:1456
#, 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:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, 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:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, 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:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:302
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:307
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:398
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
-#: git-send-email.perl:470
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:529
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:531
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:533
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:538
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:667
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"致命错误：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:678
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:701
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "为写入打开 %s 失败: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:796
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:886
+#: git-send-email.perl:913
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:891
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:899
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:918
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:936
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "致命错误：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:948
+#: git-send-email.perl:975
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:1006 git-send-email.perl:1014
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1018
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1335
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1418
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1433
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-#: git-send-email.perl:1436
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1511
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1529
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1547
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1591
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1567
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1638
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1691
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1726
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1837
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1844
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1848
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:1930
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-send-email.perl:1947
+#: git-send-email.perl:1974
#, 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:1951
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
strbuf_addstr(buf, ", ");
strbuf_humanise_bytes(buf, total);
strbuf_addstr(buf, " | ");
- strbuf_humanise_bytes(buf, rate * 1024);
- strbuf_addstr(buf, "/s");
+ strbuf_humanise_rate(buf, rate * 1024);
}
void display_throughput(struct progress *progress, uint64_t total)
--- /dev/null
+#include "cache.h"
+#include "object-store.h"
+#include "promisor-remote.h"
+#include "config.h"
+#include "transport.h"
+
+static char *repository_format_partial_clone;
+static const char *core_partial_clone_filter_default;
+
+void set_repository_format_partial_clone(char *partial_clone)
+{
+ repository_format_partial_clone = xstrdup_or_null(partial_clone);
+}
+
+static int fetch_refs(const char *remote_name, struct ref *ref)
+{
+ struct remote *remote;
+ struct transport *transport;
+ int original_fetch_if_missing = fetch_if_missing;
+ int res;
+
+ fetch_if_missing = 0;
+ remote = remote_get(remote_name);
+ if (!remote->url[0])
+ die(_("Remote with no URL"));
+ transport = transport_get(remote, remote->url[0]);
+
+ transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
+ transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
+ res = transport_fetch_refs(transport, ref);
+ fetch_if_missing = original_fetch_if_missing;
+
+ return res;
+}
+
+static int fetch_objects(const char *remote_name,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ struct ref *ref = NULL;
+ int i;
+
+ for (i = 0; i < oid_nr; i++) {
+ struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
+ oidcpy(&new_ref->old_oid, &oids[i]);
+ new_ref->exact_oid = 1;
+ new_ref->next = ref;
+ ref = new_ref;
+ }
+ return fetch_refs(remote_name, ref);
+}
+
+static struct promisor_remote *promisors;
+static struct promisor_remote **promisors_tail = &promisors;
+
+static struct promisor_remote *promisor_remote_new(const char *remote_name)
+{
+ struct promisor_remote *r;
+
+ if (*remote_name == '/') {
+ warning(_("promisor remote name cannot begin with '/': %s"),
+ remote_name);
+ return NULL;
+ }
+
+ FLEX_ALLOC_STR(r, name, remote_name);
+
+ *promisors_tail = r;
+ promisors_tail = &r->next;
+
+ return r;
+}
+
+static struct promisor_remote *promisor_remote_lookup(const char *remote_name,
+ struct promisor_remote **previous)
+{
+ struct promisor_remote *r, *p;
+
+ for (p = NULL, r = promisors; r; p = r, r = r->next)
+ if (!strcmp(r->name, remote_name)) {
+ if (previous)
+ *previous = p;
+ return r;
+ }
+
+ return NULL;
+}
+
+static void promisor_remote_move_to_tail(struct promisor_remote *r,
+ struct promisor_remote *previous)
+{
+ if (previous)
+ previous->next = r->next;
+ else
+ promisors = r->next ? r->next : r;
+ r->next = NULL;
+ *promisors_tail = r;
+ promisors_tail = &r->next;
+}
+
+static int promisor_remote_config(const char *var, const char *value, void *data)
+{
+ const char *name;
+ int namelen;
+ const char *subkey;
+
+ if (!strcmp(var, "core.partialclonefilter"))
+ return git_config_string(&core_partial_clone_filter_default,
+ var, value);
+
+ if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
+ return 0;
+
+ if (!strcmp(subkey, "promisor")) {
+ char *remote_name;
+
+ if (!git_config_bool(var, value))
+ return 0;
+
+ remote_name = xmemdupz(name, namelen);
+
+ if (!promisor_remote_lookup(remote_name, NULL))
+ promisor_remote_new(remote_name);
+
+ free(remote_name);
+ return 0;
+ }
+ if (!strcmp(subkey, "partialclonefilter")) {
+ struct promisor_remote *r;
+ char *remote_name = xmemdupz(name, namelen);
+
+ r = promisor_remote_lookup(remote_name, NULL);
+ if (!r)
+ r = promisor_remote_new(remote_name);
+
+ free(remote_name);
+
+ if (!r)
+ return 0;
+
+ return git_config_string(&r->partial_clone_filter, var, value);
+ }
+
+ return 0;
+}
+
+static int initialized;
+
+static void promisor_remote_init(void)
+{
+ if (initialized)
+ return;
+ initialized = 1;
+
+ git_config(promisor_remote_config, NULL);
+
+ if (repository_format_partial_clone) {
+ struct promisor_remote *o, *previous;
+
+ o = promisor_remote_lookup(repository_format_partial_clone,
+ &previous);
+ if (o)
+ promisor_remote_move_to_tail(o, previous);
+ else
+ promisor_remote_new(repository_format_partial_clone);
+ }
+}
+
+static void promisor_remote_clear(void)
+{
+ while (promisors) {
+ struct promisor_remote *r = promisors;
+ promisors = promisors->next;
+ free(r);
+ }
+
+ promisors_tail = &promisors;
+}
+
+void promisor_remote_reinit(void)
+{
+ initialized = 0;
+ promisor_remote_clear();
+ promisor_remote_init();
+}
+
+struct promisor_remote *promisor_remote_find(const char *remote_name)
+{
+ promisor_remote_init();
+
+ if (!remote_name)
+ return promisors;
+
+ return promisor_remote_lookup(remote_name, NULL);
+}
+
+int has_promisor_remote(void)
+{
+ return !!promisor_remote_find(NULL);
+}
+
+static int remove_fetched_oids(struct repository *repo,
+ struct object_id **oids,
+ int oid_nr, int to_free)
+{
+ int i, remaining_nr = 0;
+ int *remaining = xcalloc(oid_nr, sizeof(*remaining));
+ struct object_id *old_oids = *oids;
+ struct object_id *new_oids;
+
+ for (i = 0; i < oid_nr; i++)
+ if (oid_object_info_extended(repo, &old_oids[i], NULL,
+ OBJECT_INFO_SKIP_FETCH_OBJECT)) {
+ remaining[i] = 1;
+ remaining_nr++;
+ }
+
+ if (remaining_nr) {
+ int j = 0;
+ new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+ for (i = 0; i < oid_nr; i++)
+ if (remaining[i])
+ oidcpy(&new_oids[j++], &old_oids[i]);
+ *oids = new_oids;
+ if (to_free)
+ free(old_oids);
+ }
+
+ free(remaining);
+
+ return remaining_nr;
+}
+
+int promisor_remote_get_direct(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ struct promisor_remote *r;
+ struct object_id *remaining_oids = (struct object_id *)oids;
+ int remaining_nr = oid_nr;
+ int to_free = 0;
+ int res = -1;
+
+ promisor_remote_init();
+
+ for (r = promisors; r; r = r->next) {
+ if (fetch_objects(r->name, remaining_oids, remaining_nr) < 0) {
+ if (remaining_nr == 1)
+ continue;
+ remaining_nr = remove_fetched_oids(repo, &remaining_oids,
+ remaining_nr, to_free);
+ if (remaining_nr) {
+ to_free = 1;
+ continue;
+ }
+ }
+ res = 0;
+ break;
+ }
+
+ if (to_free)
+ free(remaining_oids);
+
+ return res;
+}
--- /dev/null
+#ifndef PROMISOR_REMOTE_H
+#define PROMISOR_REMOTE_H
+
+struct object_id;
+
+/*
+ * Promisor remote linked list
+ *
+ * Information in its fields come from remote.XXX config entries or
+ * from extensions.partialclone or core.partialclonefilter.
+ */
+struct promisor_remote {
+ struct promisor_remote *next;
+ const char *partial_clone_filter;
+ const char name[FLEX_ARRAY];
+};
+
+extern void promisor_remote_reinit(void);
+extern struct promisor_remote *promisor_remote_find(const char *remote_name);
+extern int has_promisor_remote(void);
+extern int promisor_remote_get_direct(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr);
+
+/*
+ * This should be used only once from setup.c to set the value we got
+ * from the extensions.partialclone config option.
+ */
+extern void set_repository_format_partial_clone(char *partial_clone);
+
+#endif /* PROMISOR_REMOTE_H */
#include "commit.h"
#include "pretty.h"
#include "userdiff.h"
+#include "apply.h"
struct patch_util {
/* For the search for an exact match */
struct object_id oid;
};
+static size_t find_end_of_line(char *buffer, unsigned long size)
+{
+ char *eol = memchr(buffer, '\n', size);
+
+ if (!eol)
+ return size;
+
+ *eol = '\0';
+ return eol + 1 - buffer;
+}
+
/*
* Reads the patches into a string list, with the `util` field being populated
* as struct object_id (will need to be free()d).
static int read_patches(const char *range, struct string_list *list)
{
struct child_process cp = CHILD_PROCESS_INIT;
- FILE *in;
- struct strbuf buf = STRBUF_INIT, line = STRBUF_INIT;
+ struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
struct patch_util *util = NULL;
int in_header = 1;
+ char *line, *current_filename = NULL;
+ int offset, len;
+ size_t size;
argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
"--reverse", "--date-order", "--decorate=no",
if (start_command(&cp))
return error_errno(_("could not start `log`"));
- in = fdopen(cp.out, "r");
- if (!in) {
+ if (strbuf_read(&contents, cp.out, 0) < 0) {
error_errno(_("could not read `log` output"));
finish_command(&cp);
return -1;
}
- while (strbuf_getline(&line, in) != EOF) {
+ line = contents.buf;
+ size = contents.len;
+ for (offset = 0; size > 0; offset += len, size -= len, line += len) {
const char *p;
- if (skip_prefix(line.buf, "commit ", &p)) {
+ len = find_end_of_line(line, size);
+ line[len - 1] = '\0';
+ if (skip_prefix(line, "commit ", &p)) {
if (util) {
string_list_append(list, buf.buf)->util = util;
strbuf_reset(&buf);
free(util);
string_list_clear(list, 1);
strbuf_release(&buf);
- strbuf_release(&line);
- fclose(in);
+ strbuf_release(&contents);
finish_command(&cp);
return -1;
}
continue;
}
- if (starts_with(line.buf, "diff --git")) {
+ if (starts_with(line, "diff --git")) {
+ struct patch patch = { 0 };
+ struct strbuf root = STRBUF_INIT;
+ int linenr = 0;
+
in_header = 0;
strbuf_addch(&buf, '\n');
if (!util->diff_offset)
util->diff_offset = buf.len;
- strbuf_addch(&buf, ' ');
- strbuf_addbuf(&buf, &line);
+ line[len - 1] = '\n';
+ len = parse_git_diff_header(&root, &linenr, 1, line,
+ len, size, &patch);
+ if (len < 0)
+ die(_("could not parse git header '%.*s'"), (int)len, line);
+ strbuf_addstr(&buf, " ## ");
+ if (patch.is_new > 0)
+ strbuf_addf(&buf, "%s (new)", patch.new_name);
+ else if (patch.is_delete > 0)
+ strbuf_addf(&buf, "%s (deleted)", patch.old_name);
+ else if (patch.is_rename)
+ strbuf_addf(&buf, "%s => %s", patch.old_name, patch.new_name);
+ else
+ strbuf_addstr(&buf, patch.new_name);
+
+ free(current_filename);
+ if (patch.is_delete > 0)
+ current_filename = xstrdup(patch.old_name);
+ else
+ current_filename = xstrdup(patch.new_name);
+
+ if (patch.new_mode && patch.old_mode &&
+ patch.old_mode != patch.new_mode)
+ strbuf_addf(&buf, " (mode change %06o => %06o)",
+ patch.old_mode, patch.new_mode);
+
+ strbuf_addstr(&buf, " ##");
} else if (in_header) {
- if (starts_with(line.buf, "Author: ")) {
- strbuf_addbuf(&buf, &line);
+ if (starts_with(line, "Author: ")) {
+ strbuf_addstr(&buf, " ## Metadata ##\n");
+ strbuf_addstr(&buf, line);
strbuf_addstr(&buf, "\n\n");
- } else if (starts_with(line.buf, " ")) {
- strbuf_rtrim(&line);
- strbuf_addbuf(&buf, &line);
+ strbuf_addstr(&buf, " ## Commit message ##\n");
+ } else if (starts_with(line, " ")) {
+ p = line + len - 2;
+ while (isspace(*p) && p >= line)
+ p--;
+ strbuf_add(&buf, line, p - line + 1);
strbuf_addch(&buf, '\n');
}
continue;
- } else if (starts_with(line.buf, "@@ "))
+ } else if (skip_prefix(line, "@@ ", &p)) {
+ p = strstr(p, "@@");
strbuf_addstr(&buf, "@@");
- else if (!line.buf[0] || starts_with(line.buf, "index "))
+ if (current_filename && p[2])
+ strbuf_addf(&buf, " %s:", current_filename);
+ if (p)
+ strbuf_addstr(&buf, p + 2);
+ } else if (!line[0])
/*
* A completely blank (not ' \n', which is context)
* line is not valid in a diff. We skip it
* silently, because this neatly handles the blank
* separator line between commits in git-log
* output.
- *
- * We also want to ignore the diff's `index` lines
- * because they contain exact blob hashes in which
- * we are not interested.
*/
continue;
- else if (line.buf[0] == '>') {
+ else if (line[0] == '>') {
strbuf_addch(&buf, '+');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
- } else if (line.buf[0] == '<') {
+ strbuf_addstr(&buf, line + 1);
+ } else if (line[0] == '<') {
strbuf_addch(&buf, '-');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
- } else if (line.buf[0] == '#') {
+ strbuf_addstr(&buf, line + 1);
+ } else if (line[0] == '#') {
strbuf_addch(&buf, ' ');
- strbuf_add(&buf, line.buf + 1, line.len - 1);
+ strbuf_addstr(&buf, line + 1);
} else {
strbuf_addch(&buf, ' ');
- strbuf_addbuf(&buf, &line);
+ strbuf_addstr(&buf, line);
}
strbuf_addch(&buf, '\n');
util->diffsize++;
}
- fclose(in);
- strbuf_release(&line);
+ strbuf_release(&contents);
if (util)
string_list_append(list, buf.buf)->util = util;
strbuf_release(&buf);
+ free(current_filename);
if (finish_command(&cp))
return -1;
}
static int patch_util_cmp(const void *dummy, const struct patch_util *a,
- const struct patch_util *b, const char *keydata)
+ const struct patch_util *b, const char *keydata)
{
return strcmp(a->diff, keydata ? keydata : b->diff);
}
fwrite(buf->buf, buf->len, 1, diffopt->file);
}
-static struct userdiff_driver no_func_name = {
- .funcname = { "$^", 0 }
+static struct userdiff_driver section_headers = {
+ .funcname = { "^ ## (.*) ##$\n"
+ "^.?@@ (.*)$", REG_EXTENDED }
};
static struct diff_filespec *get_filespec(const char *name, const char *p)
spec->size = strlen(p);
spec->should_munmap = 0;
spec->is_stdin = 1;
- spec->driver = &no_func_name;
+ spec->driver = §ion_headers;
return spec;
}
static void patch_diff(const char *a, const char *b,
- struct diff_options *diffopt)
+ struct diff_options *diffopt)
{
diff_queue(&diff_queued_diff,
get_filespec("a", a), get_filespec("b", b));
opts.output_format = DIFF_FORMAT_PATCH;
opts.flags.suppress_diff_headers = 1;
opts.flags.dual_color_diffed_diffs = dual_color;
+ opts.flags.suppress_hunk_header_line_count = 1;
opts.output_prefix = output_prefix_cb;
strbuf_addstr(&indent, " ");
opts.output_prefix_data = &indent;
const char *path, void *data)
{
struct stat st;
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
struct packed_git *p, uint32_t pos,
void *data)
{
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(the_repository, oid);
if (obj && obj->flags & SEEN)
return 0;
#define INDEX_FORMAT_DEFAULT 3
-static unsigned int get_index_format_default(void)
+static unsigned int get_index_format_default(struct repository *r)
{
char *envversion = getenv("GIT_INDEX_VERSION");
char *endp;
- int value;
unsigned int version = INDEX_FORMAT_DEFAULT;
if (!envversion) {
- if (!git_config_get_int("index.version", &value))
- version = value;
+ prepare_repo_settings(r);
+
+ if (r->settings.index_version >= 0)
+ version = r->settings.index_version;
if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
warning(_("index.version set, but the value is invalid.\n"
"Using version %i"), INDEX_FORMAT_DEFAULT);
static void tweak_untracked_cache(struct index_state *istate)
{
- switch (git_config_get_untracked_cache()) {
- case -1: /* keep: do nothing */
- break;
- case 0: /* false */
+ struct repository *r = the_repository;
+
+ prepare_repo_settings(r);
+
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) {
remove_untracked_cache(istate);
- break;
- case 1: /* true */
- add_untracked_cache(istate);
- break;
- default: /* unknown value: do nothing */
- break;
+ return;
}
+
+ if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+ add_untracked_cache(istate);
}
static void tweak_split_index(struct index_state *istate)
}
static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size,
- unsigned long src_offset, int nr_threads, struct index_entry_offset_table *ieot)
+ int nr_threads, struct index_entry_offset_table *ieot)
{
int i, offset, ieot_blocks, ieot_start, err;
struct load_cache_entries_thread_data *data;
ieot = read_ieot_extension(mmap, mmap_size, extension_offset);
if (ieot) {
- src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, src_offset, nr_threads, ieot);
+ src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot);
free(ieot);
} else {
src_offset += load_all_cache_entries(istate, mmap, mmap_size, src_offset);
}
if (!istate->version) {
- istate->version = get_index_format_default();
+ istate->version = get_index_format_default(the_repository);
if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
init_split_index(istate);
}
#include "commit-slab.h"
#include "commit-graph.h"
#include "commit-reach.h"
+#include "worktree.h"
+#include "hashmap.h"
+#include "argv-array.h"
static struct ref_msg {
const char *gone;
struct object_info info;
} oi, oi_deref;
+struct ref_to_worktree_entry {
+ struct hashmap_entry ent; /* must be the first member! */
+ struct worktree *wt; /* key is wt->head_ref */
+};
+
+static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata,
+ const void *existing_hashmap_entry_to_test,
+ const void *key,
+ const void *keydata_aka_refname)
+{
+ const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test;
+ const struct ref_to_worktree_entry *k = key;
+ return strcmp(e->wt->head_ref,
+ keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref);
+}
+
+static struct ref_to_worktree_map {
+ struct hashmap map;
+ struct worktree **worktrees;
+} ref_to_worktree_map;
+
/*
* An atom is a valid field atom listed below, possibly prefixed with
* a "*" to denote deref_tag().
{ "flag", SOURCE_NONE },
{ "HEAD", SOURCE_NONE, FIELD_STR, head_atom_parser },
{ "color", SOURCE_NONE, FIELD_STR, color_atom_parser },
+ { "worktreepath", SOURCE_NONE },
{ "align", SOURCE_NONE, FIELD_STR, align_atom_parser },
{ "end", SOURCE_NONE },
{ "if", SOURCE_NONE, FIELD_STR, if_atom_parser },
if (!strncmp(cp, " <", 2))
return xmemdupz(buf, cp - buf);
}
- return "";
+ return xstrdup("");
}
static const char *copy_email(const char *buf)
const char *email = strchr(buf, '<');
const char *eoemail;
if (!email)
- return "";
+ return xstrdup("");
eoemail = strchr(email, '>');
if (!eoemail)
- return "";
+ return xstrdup("");
return xmemdupz(email, eoemail + 1 - email);
}
struct wt_status_state state;
memset(&state, 0, sizeof(state));
wt_status_get_state(the_repository, &state, 1);
+
+ /*
+ * The ( character must be hard-coded and not part of a localizable
+ * string, since the description is used as a sort key and compared
+ * with ref names.
+ */
+ strbuf_addch(&desc, '(');
if (state.rebase_in_progress ||
state.rebase_interactive_in_progress) {
if (state.branch)
- strbuf_addf(&desc, _("(no branch, rebasing %s)"),
+ strbuf_addf(&desc, _("no branch, rebasing %s"),
state.branch);
else
- strbuf_addf(&desc, _("(no branch, rebasing detached HEAD %s)"),
+ strbuf_addf(&desc, _("no branch, rebasing detached HEAD %s"),
state.detached_from);
} else if (state.bisect_in_progress)
- strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
+ strbuf_addf(&desc, _("no branch, bisect started on %s"),
state.branch);
else if (state.detached_from) {
if (state.detached_at)
- /*
- * TRANSLATORS: make sure this matches "HEAD
- * detached at " in wt-status.c
- */
- strbuf_addf(&desc, _("(HEAD detached at %s)"),
- state.detached_from);
+ strbuf_addstr(&desc, HEAD_DETACHED_AT);
else
- /*
- * TRANSLATORS: make sure this matches "HEAD
- * detached from " in wt-status.c
- */
- strbuf_addf(&desc, _("(HEAD detached from %s)"),
- state.detached_from);
+ strbuf_addstr(&desc, HEAD_DETACHED_FROM);
+ strbuf_addstr(&desc, state.detached_from);
}
else
- strbuf_addstr(&desc, _("(no branch)"));
+ strbuf_addstr(&desc, _("no branch"));
+ strbuf_addch(&desc, ')');
+
free(state.branch);
free(state.onto);
free(state.detached_from);
return 0;
}
+static void populate_worktree_map(struct hashmap *map, struct worktree **worktrees)
+{
+ int i;
+
+ for (i = 0; worktrees[i]; i++) {
+ if (worktrees[i]->head_ref) {
+ struct ref_to_worktree_entry *entry;
+ entry = xmalloc(sizeof(*entry));
+ entry->wt = worktrees[i];
+ hashmap_entry_init(entry, strhash(worktrees[i]->head_ref));
+
+ hashmap_add(map, entry);
+ }
+ }
+}
+
+static void lazy_init_worktree_map(void)
+{
+ if (ref_to_worktree_map.worktrees)
+ return;
+
+ ref_to_worktree_map.worktrees = get_worktrees(0);
+ hashmap_init(&(ref_to_worktree_map.map), ref_to_worktree_map_cmpfnc, NULL, 0);
+ populate_worktree_map(&(ref_to_worktree_map.map), ref_to_worktree_map.worktrees);
+}
+
+static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref)
+{
+ struct hashmap_entry entry;
+ struct ref_to_worktree_entry *lookup_result;
+
+ lazy_init_worktree_map();
+
+ hashmap_entry_init(&entry, strhash(ref->refname));
+ lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname);
+
+ if (lookup_result)
+ return xstrdup(lookup_result->wt->path);
+ else
+ return xstrdup("");
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
if (starts_with(name, "refname"))
refname = get_refname(atom, ref);
+ else if (!strcmp(name, "worktreepath")) {
+ if (ref->kind == FILTER_REFS_BRANCHES)
+ v->s = get_worktree_path(atom, ref);
+ else
+ v->s = xstrdup("");
+ continue;
+ }
else if (starts_with(name, "symref"))
refname = get_symref(atom, ref);
else if (starts_with(name, "upstream")) {
return match_pattern(filter, refname);
}
-/*
- * Find the longest prefix of pattern we can pass to
- * `for_each_fullref_in()`, namely the part of pattern preceding the
- * first glob character. (Note that `for_each_fullref_in()` is
- * perfectly happy working with a prefix that doesn't end at a
- * pathname component boundary.)
- */
-static void find_longest_prefix(struct strbuf *out, const char *pattern)
+static int qsort_strcmp(const void *va, const void *vb)
+{
+ const char *a = *(const char **)va;
+ const char *b = *(const char **)vb;
+
+ return strcmp(a, b);
+}
+
+static void find_longest_prefixes_1(struct string_list *out,
+ struct strbuf *prefix,
+ const char **patterns, size_t nr)
{
- const char *p;
+ size_t i;
+
+ for (i = 0; i < nr; i++) {
+ char c = patterns[i][prefix->len];
+ if (!c || is_glob_special(c)) {
+ string_list_append(out, prefix->buf);
+ return;
+ }
+ }
+
+ i = 0;
+ while (i < nr) {
+ size_t end;
+
+ /*
+ * Set "end" to the index of the element _after_ the last one
+ * in our group.
+ */
+ for (end = i + 1; end < nr; end++) {
+ if (patterns[i][prefix->len] != patterns[end][prefix->len])
+ break;
+ }
+
+ strbuf_addch(prefix, patterns[i][prefix->len]);
+ find_longest_prefixes_1(out, prefix, patterns + i, end - i);
+ strbuf_setlen(prefix, prefix->len - 1);
+
+ i = end;
+ }
+}
+
+static void find_longest_prefixes(struct string_list *out,
+ const char **patterns)
+{
+ struct argv_array sorted = ARGV_ARRAY_INIT;
+ struct strbuf prefix = STRBUF_INIT;
+
+ argv_array_pushv(&sorted, patterns);
+ QSORT(sorted.argv, sorted.argc, qsort_strcmp);
- for (p = pattern; *p && !is_glob_special(*p); p++)
- ;
+ find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc);
- strbuf_add(out, pattern, p - pattern);
+ argv_array_clear(&sorted);
+ strbuf_release(&prefix);
}
/*
void *cb_data,
int broken)
{
- struct strbuf prefix = STRBUF_INIT;
+ struct string_list prefixes = STRING_LIST_INIT_DUP;
+ struct string_list_item *prefix;
int ret;
if (!filter->match_as_path) {
return for_each_fullref_in("", cb, cb_data, broken);
}
- if (filter->name_patterns[1]) {
- /*
- * multiple patterns; in theory this could still work as long
- * as the patterns are disjoint. We'd just make multiple calls
- * to for_each_ref(). But if they're not disjoint, we'd end up
- * reporting the same ref multiple times. So let's punt on that
- * for now.
- */
- return for_each_fullref_in("", cb, cb_data, broken);
- }
+ find_longest_prefixes(&prefixes, filter->name_patterns);
- find_longest_prefix(&prefix, filter->name_patterns[0]);
+ for_each_string_list_item(prefix, &prefixes) {
+ ret = for_each_fullref_in(prefix->string, cb, cb_data, broken);
+ if (ret)
+ break;
+ }
- ret = for_each_fullref_in(prefix.buf, cb, cb_data, broken);
- strbuf_release(&prefix);
+ string_list_clear(&prefixes, 0);
return ret;
}
{
free((char *)item->symref);
if (item->value) {
- free((char *)item->value->s);
+ int i;
+ for (i = 0; i < used_atom_cnt; i++)
+ free((char *)item->value[i].s);
free(item->value);
}
free(item);
{
int i;
- for (i = 0; i < used_atom_cnt; i++)
- free((char *)used_atom[i].name);
- FREE_AND_NULL(used_atom);
- used_atom_cnt = 0;
for (i = 0; i < array->nr; i++)
free_array_item(array->items[i]);
FREE_AND_NULL(array->items);
array->nr = array->alloc = 0;
+
+ for (i = 0; i < used_atom_cnt; i++)
+ free((char *)used_atom[i].name);
+ FREE_AND_NULL(used_atom);
+ used_atom_cnt = 0;
+
+ if (ref_to_worktree_map.worktrees) {
+ hashmap_free(&(ref_to_worktree_map.map), 1);
+ free_worktrees(ref_to_worktree_map.worktrees);
+ ref_to_worktree_map.worktrees = NULL;
+ }
}
static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
* not legal. It is legal if it is something reasonable to have under
* ".git/refs/"; We do not like it if:
*
- * - any path component of it begins with ".", or
+ * - it begins with ".", or
* - it has double dots "..", or
* - it has ASCII control characters, or
* - it has ":", "?", "[", "\", "^", "~", SP, or TAB anywhere, or
* - it ends with a "/", or
* - it ends with ".lock", or
* - it contains a "@{" portion
+ *
+ * When sanitized is not NULL, instead of rejecting the input refname
+ * as an error, try to come up with a usable replacement for the input
+ * refname in it.
*/
-static int check_refname_component(const char *refname, int *flags)
+static int check_refname_component(const char *refname, int *flags,
+ struct strbuf *sanitized)
{
const char *cp;
char last = '\0';
+ size_t component_start = 0; /* garbage - not a reasonable initial value */
+
+ if (sanitized)
+ component_start = sanitized->len;
for (cp = refname; ; cp++) {
int ch = *cp & 255;
unsigned char disp = refname_disposition[ch];
+
+ if (sanitized && disp != 1)
+ strbuf_addch(sanitized, ch);
+
switch (disp) {
case 1:
goto out;
case 2:
- if (last == '.')
- return -1; /* Refname contains "..". */
+ if (last == '.') { /* Refname contains "..". */
+ if (sanitized)
+ /* collapse ".." to single "." */
+ strbuf_setlen(sanitized, sanitized->len - 1);
+ else
+ return -1;
+ }
break;
case 3:
- if (last == '@')
- return -1; /* Refname contains "@{". */
+ if (last == '@') { /* Refname contains "@{". */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ }
break;
case 4:
- return -1;
+ /* forbidden char */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ break;
case 5:
- if (!(*flags & REFNAME_REFSPEC_PATTERN))
- return -1; /* refspec can't be a pattern */
+ if (!(*flags & REFNAME_REFSPEC_PATTERN)) {
+ /* refspec can't be a pattern */
+ if (sanitized)
+ sanitized->buf[sanitized->len-1] = '-';
+ else
+ return -1;
+ }
/*
* Unset the pattern flag so that we only accept
out:
if (cp == refname)
return 0; /* Component has zero length. */
- if (refname[0] == '.')
- return -1; /* Component starts with '.'. */
+
+ if (refname[0] == '.') { /* Component starts with '.'. */
+ if (sanitized)
+ sanitized->buf[component_start] = '-';
+ else
+ return -1;
+ }
if (cp - refname >= LOCK_SUFFIX_LEN &&
- !memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN))
- return -1; /* Refname ends with ".lock". */
+ !memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN)) {
+ if (!sanitized)
+ return -1;
+ /* Refname ends with ".lock". */
+ while (strbuf_strip_suffix(sanitized, LOCK_SUFFIX)) {
+ /* try again in case we have .lock.lock */
+ }
+ }
return cp - refname;
}
-int check_refname_format(const char *refname, int flags)
+static int check_or_sanitize_refname(const char *refname, int flags,
+ struct strbuf *sanitized)
{
int component_len, component_count = 0;
- if (!strcmp(refname, "@"))
+ if (!strcmp(refname, "@")) {
/* Refname is a single character '@'. */
- return -1;
+ if (sanitized)
+ strbuf_addch(sanitized, '-');
+ else
+ return -1;
+ }
while (1) {
+ if (sanitized && sanitized->len)
+ strbuf_complete(sanitized, '/');
+
/* We are at the start of a path component. */
- component_len = check_refname_component(refname, &flags);
- if (component_len <= 0)
+ component_len = check_refname_component(refname, &flags,
+ sanitized);
+ if (sanitized && component_len == 0)
+ ; /* OK, omit empty component */
+ else if (component_len <= 0)
return -1;
component_count++;
refname += component_len + 1;
}
- if (refname[component_len - 1] == '.')
- return -1; /* Refname ends with '.'. */
+ if (refname[component_len - 1] == '.') {
+ /* Refname ends with '.'. */
+ if (sanitized)
+ ; /* omit ending dot */
+ else
+ return -1;
+ }
if (!(flags & REFNAME_ALLOW_ONELEVEL) && component_count < 2)
return -1; /* Refname has only one component. */
return 0;
}
+int check_refname_format(const char *refname, int flags)
+{
+ return check_or_sanitize_refname(refname, flags, NULL);
+}
+
+void sanitize_refname_component(const char *refname, struct strbuf *out)
+{
+ if (check_or_sanitize_refname(refname, REFNAME_ALLOW_ONELEVEL, out))
+ BUG("sanitizing refname '%s' check returned error", refname);
+}
+
int refname_is_safe(const char *refname)
{
const char *rest;
enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
{
- struct object *o = lookup_unknown_object(name->hash);
+ struct object *o = lookup_unknown_object(name);
if (o->type == OBJ_NONE) {
int type = oid_object_info(the_repository, name, NULL);
*/
int check_refname_format(const char *refname, int flags);
+/*
+ * Apply the rules from check_refname_format, but mutate the result until it
+ * is acceptable, and place the result in "out".
+ */
+void sanitize_refname_component(const char *refname, struct strbuf *out);
+
const char *prettify_refname(const char *refname);
char *refs_shorten_unambiguous_ref(struct ref_store *refs,
static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
const char *gitdir)
{
- struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
- struct ref_iterator *ref_iterator = &iter->base;
+ struct dir_iterator *diter;
+ struct files_reflog_iterator *iter;
+ struct ref_iterator *ref_iterator;
struct strbuf sb = STRBUF_INIT;
- base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
strbuf_addf(&sb, "%s/logs", gitdir);
- iter->dir_iterator = dir_iterator_begin(sb.buf);
+
+ diter = dir_iterator_begin(sb.buf, 0);
+ if (!diter) {
+ strbuf_release(&sb);
+ return empty_ref_iterator_begin();
+ }
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+
+ base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
+ iter->dir_iterator = diter;
iter->ref_store = ref_store;
strbuf_release(&sb);
}
/*
- * Now that we hold the `packed-refs` lock, make sure that our
- * snapshot matches the current version of the file. Normally
- * `get_snapshot()` does that for us, but that function
- * assumes that when the file is locked, any existing snapshot
- * is still valid. We've just locked the file, but it might
- * have changed the moment *before* we locked it.
+ * There is a stat-validity problem might cause `update-ref -d`
+ * lost the newly commit of a ref, because a new `packed-refs`
+ * file might has the same on-disk file attributes such as
+ * timestamp, file size and inode value, but has a changed
+ * ref value.
+ *
+ * This could happen with a very small chance when
+ * `update-ref -d` is called and at the same time another
+ * `pack-refs --all` process is running.
+ *
+ * Now that we hold the `packed-refs` lock, it is important
+ * to make sure we could read the latest version of
+ * `packed-refs` file no matter we have just mmap it or not.
+ * So what need to do is clear the snapshot if we hold it
+ * already.
*/
- validate_snapshot(refs);
+ clear_snapshot(refs);
/*
* Now make sure that the packed-refs file as it exists in the
--- /dev/null
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+
+#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
+
+void prepare_repo_settings(struct repository *r)
+{
+ int value;
+ char *strval;
+
+ if (r->settings.initialized)
+ return;
+
+ /* Defaults */
+ memset(&r->settings, -1, sizeof(r->settings));
+
+ if (!repo_config_get_bool(r, "core.commitgraph", &value))
+ r->settings.core_commit_graph = value;
+ if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
+ r->settings.gc_write_commit_graph = value;
+ UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
+ UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
+
+ if (!repo_config_get_bool(r, "index.version", &value))
+ r->settings.index_version = value;
+ if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
+ if (value == 0)
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
+ else
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+ } else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+ if (!strcasecmp(strval, "keep"))
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+
+ free(strval);
+ }
+
+ if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+ if (!strcasecmp(strval, "skipping"))
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+ else
+ r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+ }
+
+ if (!repo_config_get_bool(r, "pack.usesparse", &value))
+ r->settings.pack_use_sparse = value;
+ if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
+ UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
+ UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
+ }
+ if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
+ UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
+ }
+
+ /* Hack for test programs like test-dump-untracked-cache */
+ if (ignore_untracked_cache_config)
+ r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+ else
+ UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
+
+ UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
+}
struct raw_object_store;
struct submodule_cache;
+enum untracked_cache_setting {
+ UNTRACKED_CACHE_UNSET = -1,
+ UNTRACKED_CACHE_REMOVE = 0,
+ UNTRACKED_CACHE_KEEP = 1,
+ UNTRACKED_CACHE_WRITE = 2
+};
+
+enum fetch_negotiation_setting {
+ FETCH_NEGOTIATION_UNSET = -1,
+ FETCH_NEGOTIATION_NONE = 0,
+ FETCH_NEGOTIATION_DEFAULT = 1,
+ FETCH_NEGOTIATION_SKIPPING = 2,
+};
+
+struct repo_settings {
+ int initialized;
+
+ int core_commit_graph;
+ int gc_write_commit_graph;
+
+ int index_version;
+ enum untracked_cache_setting core_untracked_cache;
+
+ int pack_use_sparse;
+ enum fetch_negotiation_setting fetch_negotiation_algorithm;
+};
+
struct repository {
/* Environment */
/*
*/
char *submodule_prefix;
+ struct repo_settings settings;
+
/* Subsystems */
/*
* Repository's config which contains key-value pairs from the usual
*/
void repo_update_index_if_able(struct repository *, struct lock_file *);
+void prepare_repo_settings(struct repository *r);
#endif /* REPOSITORY_H */
die("unable to parse commit %s", name);
if (flags & UNINTERESTING) {
mark_parents_uninteresting(commit);
- revs->limited = 1;
+
+ if (!revs->topo_order || !generation_numbers_enabled(the_repository))
+ revs->limited = 1;
}
if (revs->sources) {
char **slot = revision_sources_at(revs->sources, commit);
free_worktrees(worktrees);
}
+struct add_alternate_refs_data {
+ struct rev_info *revs;
+ unsigned int flags;
+};
+
+static void add_one_alternate_ref(const struct object_id *oid,
+ void *vdata)
+{
+ const char *name = ".alternate";
+ struct add_alternate_refs_data *data = vdata;
+ struct object *obj;
+
+ obj = get_reference(data->revs, name, oid, data->flags);
+ add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
+ add_pending_object(data->revs, obj, name);
+}
+
+static void add_alternate_refs_to_pending(struct rev_info *revs,
+ unsigned int flags)
+{
+ struct add_alternate_refs_data data;
+ data.revs = revs;
+ data.flags = flags;
+ for_each_alternate_ref(add_one_alternate_ref, &data);
+}
+
static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
int exclude_parent)
{
!strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
!strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
!strcmp(arg, "--indexed-objects") ||
+ !strcmp(arg, "--alternate-refs") ||
starts_with(arg, "--exclude=") ||
starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
add_reflogs_to_pending(revs, *flags);
} else if (!strcmp(arg, "--indexed-objects")) {
add_index_objects_to_pending(revs, *flags);
+ } else if (!strcmp(arg, "--alternate-refs")) {
+ add_alternate_refs_to_pending(revs, *flags);
} else if (!strcmp(arg, "--not")) {
*flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) {
int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
struct argv_array prune_data = ARGV_ARRAY_INIT;
const char *submodule = NULL;
+ int seen_end_of_options = 0;
if (opt)
submodule = opt->submodule;
revarg_opt |= REVARG_CANNOT_BE_FILENAME;
for (left = i = 1; i < argc; i++) {
const char *arg = argv[i];
- if (*arg == '-') {
+ if (!seen_end_of_options && *arg == '-') {
int opts;
opts = handle_revision_pseudo_opt(submodule,
continue;
}
+ if (!strcmp(arg, "--end-of-options")) {
+ seen_end_of_options = 1;
+ continue;
+ }
+
opts = handle_revision_opt(revs, argc - i, argv + i,
&left, argv, opt);
if (opts > 0) {
struct commit *parent = p->item;
int *pi;
+ if (parent->object.flags & UNINTERESTING)
+ continue;
+
if (parse_commit_gently(parent, 1) < 0)
continue;
* GIT_AUTHOR_DATE='$author_date'
*
* where $author_name, $author_email and $author_date are quoted. We are strict
- * with our parsing, as the file was meant to be eval'd in the old
+ * with our parsing, as the file was meant to be eval'd in the now-removed
* git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs
* from what this function expects, it is better to bail out than to do
* something that the user does not expect.
return todo_list->buf.buf + item->arg_offset;
}
+static int is_command(enum todo_command command, const char **bol)
+{
+ const char *str = todo_command_info[command].str;
+ const char nick = todo_command_info[command].c;
+ const char *p = *bol + 1;
+
+ return skip_prefix(*bol, str, bol) ||
+ ((nick && **bol == nick) &&
+ (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) &&
+ (*bol = p));
+}
+
static int parse_insn_line(struct repository *r, struct todo_item *item,
const char *buf, const char *bol, char *eol)
{
}
for (i = 0; i < TODO_COMMENT; i++)
- if (skip_prefix(bol, todo_command_info[i].str, &bol)) {
- item->command = i;
- break;
- } else if ((bol + 1 == eol || bol[1] == ' ') &&
- *bol == todo_command_info[i].c) {
- bol++;
+ if (is_command(i, &bol)) {
item->command = i;
break;
}
int sequencer_get_last_command(struct repository *r, enum replay_action *action)
{
- struct todo_item item;
- char *eol;
- const char *todo_file;
+ const char *todo_file, *bol;
struct strbuf buf = STRBUF_INIT;
- int ret = -1;
+ int ret = 0;
todo_file = git_path_todo_file();
if (strbuf_read_file(&buf, todo_file, 0) < 0) {
- if (errno == ENOENT)
+ if (errno == ENOENT || errno == ENOTDIR)
return -1;
else
return error_errno("unable to open '%s'", todo_file);
}
- eol = strchrnul(buf.buf, '\n');
- if (buf.buf != eol && eol[-1] == '\r')
- eol--; /* strip Carriage Return */
- if (parse_insn_line(r, &item, buf.buf, buf.buf, eol))
- goto fail;
- if (item.command == TODO_PICK)
+ bol = buf.buf + strspn(buf.buf, " \t\r\n");
+ if (is_command(TODO_PICK, &bol) && (*bol == ' ' || *bol == '\t'))
*action = REPLAY_PICK;
- else if (item.command == TODO_REVERT)
+ else if (is_command(TODO_REVERT, &bol) &&
+ (*bol == ' ' || *bol == '\t'))
*action = REPLAY_REVERT;
else
- goto fail;
-
- ret = 0;
+ ret = -1;
- fail:
strbuf_release(&buf);
return ret;
return ret;
}
-void sequencer_post_commit_cleanup(struct repository *r)
+void sequencer_post_commit_cleanup(struct repository *r, int verbose)
{
struct replay_opts opts = REPLAY_OPTS_INIT;
int need_cleanup = 0;
if (file_exists(git_path_cherry_pick_head(r))) {
- unlink(git_path_cherry_pick_head(r));
+ if (!unlink(git_path_cherry_pick_head(r)) && verbose)
+ warning(_("cancelling a cherry picking in progress"));
opts.action = REPLAY_PICK;
need_cleanup = 1;
}
if (file_exists(git_path_revert_head(r))) {
- unlink(git_path_revert_head(r));
+ if (!unlink(git_path_revert_head(r)) && verbose)
+ warning(_("cancelling a revert in progress"));
opts.action = REPLAY_REVERT;
need_cleanup = 1;
}
return 0;
}
-static int create_seq_dir(void)
+static int create_seq_dir(struct repository *r)
{
- if (file_exists(git_path_seq_dir())) {
- error(_("a cherry-pick or revert is already in progress"));
- advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
+ enum replay_action action;
+ const char *in_progress_error = NULL;
+ const char *in_progress_advice = NULL;
+ unsigned int advise_skip = file_exists(git_path_revert_head(r)) ||
+ file_exists(git_path_cherry_pick_head(r));
+
+ if (!sequencer_get_last_command(r, &action)) {
+ switch (action) {
+ case REPLAY_REVERT:
+ in_progress_error = _("revert is already in progress");
+ in_progress_advice =
+ _("try \"git revert (--continue | %s--abort | --quit)\"");
+ break;
+ case REPLAY_PICK:
+ in_progress_error = _("cherry-pick is already in progress");
+ in_progress_advice =
+ _("try \"git cherry-pick (--continue | %s--abort | --quit)\"");
+ break;
+ default:
+ BUG("unexpected action in create_seq_dir");
+ }
+ }
+ if (in_progress_error) {
+ error("%s", in_progress_error);
+ if (advice_sequencer_in_use)
+ advise(in_progress_advice,
+ advise_skip ? "--skip | " : "");
return -1;
- } else if (mkdir(git_path_seq_dir(), 0777) < 0)
+ }
+ if (mkdir(git_path_seq_dir(), 0777) < 0)
return error_errno(_("could not create sequencer directory '%s'"),
git_path_seq_dir());
+
return 0;
}
return oideq(&actual_head, &expected_head);
}
-static int reset_for_rollback(const struct object_id *oid)
+static int reset_merge(const struct object_id *oid)
{
- const char *argv[4]; /* reset --merge <arg> + NULL */
+ int ret;
+ struct argv_array argv = ARGV_ARRAY_INIT;
- argv[0] = "reset";
- argv[1] = "--merge";
- argv[2] = oid_to_hex(oid);
- argv[3] = NULL;
- return run_command_v_opt(argv, RUN_GIT_CMD);
+ argv_array_pushl(&argv, "reset", "--merge", NULL);
+
+ if (!is_null_oid(oid))
+ argv_array_push(&argv, oid_to_hex(oid));
+
+ ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv);
+
+ return ret;
}
static int rollback_single_pick(struct repository *r)
return error(_("cannot resolve HEAD"));
if (is_null_oid(&head_oid))
return error(_("cannot abort from a branch yet to be born"));
- return reset_for_rollback(&head_oid);
+ return reset_merge(&head_oid);
+}
+
+static int skip_single_pick(void)
+{
+ struct object_id head;
+
+ if (read_ref_full("HEAD", 0, &head, NULL))
+ return error(_("cannot resolve HEAD"));
+ return reset_merge(&head);
}
int sequencer_rollback(struct repository *r, struct replay_opts *opts)
warning(_("You seem to have moved HEAD. "
"Not rewinding, check your HEAD!"));
} else
- if (reset_for_rollback(&oid))
+ if (reset_merge(&oid))
goto fail;
strbuf_release(&buf);
return sequencer_remove_state(opts);
return -1;
}
+int sequencer_skip(struct repository *r, struct replay_opts *opts)
+{
+ enum replay_action action = -1;
+ sequencer_get_last_command(r, &action);
+
+ /*
+ * Check whether the subcommand requested to skip the commit is actually
+ * in progress and that it's safe to skip the commit.
+ *
+ * opts->action tells us which subcommand requested to skip the commit.
+ * If the corresponding .git/<ACTION>_HEAD exists, we know that the
+ * action is in progress and we can skip the commit.
+ *
+ * Otherwise we check that the last instruction was related to the
+ * particular subcommand we're trying to execute and barf if that's not
+ * the case.
+ *
+ * Finally we check that the rollback is "safe", i.e., has the HEAD
+ * moved? In this case, it doesn't make sense to "reset the merge" and
+ * "skip the commit" as the user already handled this by committing. But
+ * we'd not want to barf here, instead give advice on how to proceed. We
+ * only need to check that when .git/<ACTION>_HEAD doesn't exist because
+ * it gets removed when the user commits, so if it still exists we're
+ * sure the user can't have committed before.
+ */
+ switch (opts->action) {
+ case REPLAY_REVERT:
+ if (!file_exists(git_path_revert_head(r))) {
+ if (action != REPLAY_REVERT)
+ return error(_("no revert in progress"));
+ if (!rollback_is_safe())
+ goto give_advice;
+ }
+ break;
+ case REPLAY_PICK:
+ if (!file_exists(git_path_cherry_pick_head(r))) {
+ if (action != REPLAY_PICK)
+ return error(_("no cherry-pick in progress"));
+ if (!rollback_is_safe())
+ goto give_advice;
+ }
+ break;
+ default:
+ BUG("unexpected action in sequencer_skip");
+ }
+
+ if (skip_single_pick())
+ return error(_("failed to skip the commit"));
+ if (!is_directory(git_path_seq_dir()))
+ return 0;
+
+ return sequencer_continue(r, opts);
+
+give_advice:
+ error(_("there is nothing to skip"));
+
+ if (advice_resolve_conflict) {
+ advise(_("have you committed already?\n"
+ "try \"git %s --continue\""),
+ action == REPLAY_REVERT ? "revert" : "cherry-pick");
+ }
+ return -1;
+}
+
static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
{
struct lock_file todo_lock = LOCK_INIT;
return error_resolve_conflict(_(action_name(opts)));
}
- if (!fill_tree_descriptor(&desc, &oid)) {
+ if (!fill_tree_descriptor(r, &desc, &oid)) {
error(_("failed to find tree of %s"), oid_to_hex(&oid));
rollback_lock_file(&lock);
free((void *)desc.buffer);
struct commit *head_commit, *merge_commit, *i;
struct commit_list *bases, *j, *reversed = NULL;
struct commit_list *to_merge = NULL, **tail = &to_merge;
+ const char *strategy = !opts->xopts_nr &&
+ (!opts->strategy || !strcmp(opts->strategy, "recursive")) ?
+ NULL : opts->strategy;
struct merge_options o;
int merge_arg_len, oneline_offset, can_fast_forward, ret, k;
static struct lock_file lock;
rollback_lock_file(&lock);
ret = fast_forward_to(r, &commit->object.oid,
&head_commit->object.oid, 0, opts);
+ if (flags & TODO_EDIT_MERGE_MSG) {
+ run_commit_flags |= AMEND_MSG;
+ goto fast_forward_edit;
+ }
goto leave_merge;
}
- if (to_merge->next) {
+ if (strategy || to_merge->next) {
/* Octopus merge */
struct child_process cmd = CHILD_PROCESS_INIT;
cmd.git_cmd = 1;
argv_array_push(&cmd.args, "merge");
argv_array_push(&cmd.args, "-s");
- argv_array_push(&cmd.args, "octopus");
+ if (!strategy)
+ argv_array_push(&cmd.args, "octopus");
+ else {
+ argv_array_push(&cmd.args, strategy);
+ for (k = 0; k < opts->xopts_nr; k++)
+ argv_array_pushf(&cmd.args,
+ "-X%s", opts->xopts[k]);
+ }
argv_array_push(&cmd.args, "--no-edit");
argv_array_push(&cmd.args, "--no-ff");
argv_array_push(&cmd.args, "--no-log");
* value (a negative one would indicate that the `merge`
* command needs to be rescheduled).
*/
+ fast_forward_edit:
ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
run_commit_flags);
unlink(rebase_path_author_script());
unlink(rebase_path_stopped_sha());
unlink(rebase_path_amend());
- unlink(git_path_merge_head(the_repository));
+ unlink(git_path_merge_head(r));
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
if (item->command == TODO_BREAK) {
opts, flags))
return error(_("could not commit staged changes."));
unlink(rebase_path_amend());
- unlink(git_path_merge_head(the_repository));
+ unlink(git_path_merge_head(r));
if (final_fixup) {
unlink(rebase_path_fixup_msg());
unlink(rebase_path_squash_msg());
*/
if (walk_revs_populate_todo(&todo_list, opts) ||
- create_seq_dir() < 0)
+ create_seq_dir(r) < 0)
return -1;
if (get_oid("HEAD", &oid) && (opts->action == REPLAY_REVERT))
return error(_("can't revert as initial commit"));
{
int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
+ int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
struct strbuf label = STRBUF_INIT;
struct commit_list *commits = NULL, **tail = &commits, *iter;
if (!commit)
strbuf_addf(out, "%s %s\n", cmd_reset,
- rebase_cousins ? "onto" : "[new root]");
+ rebase_cousins || root_with_onto ?
+ "onto" : "[new root]");
else {
const char *to = NULL;
struct replay_opts *opts);
int sequencer_continue(struct repository *repo, struct replay_opts *opts);
int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
+int sequencer_skip(struct repository *repo, struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
#define TODO_LIST_KEEP_EMPTY (1U << 0)
*/
#define TODO_LIST_REBASE_COUSINS (1U << 4)
#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
+/*
+ * When generating a script that rebases merges with `--root` *and* with
+ * `--onto`, we do not want to re-generate the root commits.
+ */
+#define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
+
int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
const char **argv, unsigned flags);
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
int write_basic_state(struct replay_opts *opts, const char *head_name,
struct commit *onto, const char *orig_head);
-void sequencer_post_commit_cleanup(struct repository *r);
+void sequencer_post_commit_cleanup(struct repository *r, int verbose);
int sequencer_get_last_command(struct repository* r,
enum replay_action *action);
#include "tag.h"
#include "packfile.h"
#include "object-store.h"
+#include "strbuf.h"
+
+struct update_info_ctx {
+ FILE *cur_fp;
+ FILE *old_fp; /* becomes NULL if it differs from cur_fp */
+ struct strbuf cur_sb;
+ struct strbuf old_sb;
+};
+
+static void uic_mark_stale(struct update_info_ctx *uic)
+{
+ fclose(uic->old_fp);
+ uic->old_fp = NULL;
+}
+
+static int uic_is_stale(const struct update_info_ctx *uic)
+{
+ return uic->old_fp == NULL;
+}
+
+static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
+{
+ va_list ap;
+ int ret = -1;
+
+ va_start(ap, fmt);
+
+ if (uic_is_stale(uic)) {
+ ret = vfprintf(uic->cur_fp, fmt, ap);
+ } else {
+ ssize_t r;
+ struct strbuf *cur = &uic->cur_sb;
+ struct strbuf *old = &uic->old_sb;
+
+ strbuf_reset(cur);
+ strbuf_vinsertf(cur, 0, fmt, ap);
+
+ strbuf_reset(old);
+ strbuf_grow(old, cur->len);
+ r = fread(old->buf, 1, cur->len, uic->old_fp);
+ if (r != cur->len || memcmp(old->buf, cur->buf, r))
+ uic_mark_stale(uic);
+
+ if (fwrite(cur->buf, 1, cur->len, uic->cur_fp) == cur->len)
+ ret = 0;
+ }
+
+ va_end(ap);
+
+ return ret;
+}
/*
* Create the file "path" by writing to a temporary file and renaming
* it into place. The contents of the file come from "generate", which
* should return non-zero if it encounters an error.
*/
-static int update_info_file(char *path, int (*generate)(FILE *))
+static int update_info_file(char *path,
+ int (*generate)(struct update_info_ctx *),
+ int force)
{
char *tmp = mkpathdup("%s_XXXXXX", path);
int ret = -1;
int fd = -1;
- FILE *fp = NULL, *to_close;
+ FILE *to_close;
+ struct update_info_ctx uic = {
+ .cur_fp = NULL,
+ .old_fp = NULL,
+ .cur_sb = STRBUF_INIT,
+ .old_sb = STRBUF_INIT
+ };
safe_create_leading_directories(path);
fd = git_mkstemp_mode(tmp, 0666);
if (fd < 0)
goto out;
- to_close = fp = fdopen(fd, "w");
- if (!fp)
+ to_close = uic.cur_fp = fdopen(fd, "w");
+ if (!uic.cur_fp)
goto out;
fd = -1;
- ret = generate(fp);
+
+ /* no problem on ENOENT and old_fp == NULL, it's stale, now */
+ if (!force)
+ uic.old_fp = fopen_or_warn(path, "r");
+
+ /*
+ * uic_printf will compare incremental comparison aginst old_fp
+ * and mark uic as stale if needed
+ */
+ ret = generate(&uic);
if (ret)
goto out;
- fp = NULL;
+
+ /* new file may be shorter than the old one, check here */
+ if (!uic_is_stale(&uic)) {
+ struct stat st;
+ long new_len = ftell(uic.cur_fp);
+ int old_fd = fileno(uic.old_fp);
+
+ if (new_len < 0) {
+ ret = -1;
+ goto out;
+ }
+ if (fstat(old_fd, &st) || (st.st_size != (size_t)new_len))
+ uic_mark_stale(&uic);
+ }
+
+ uic.cur_fp = NULL;
if (fclose(to_close))
goto out;
- if (adjust_shared_perm(tmp) < 0)
- goto out;
- if (rename(tmp, path) < 0)
- goto out;
+
+ if (uic_is_stale(&uic)) {
+ if (adjust_shared_perm(tmp) < 0)
+ goto out;
+ if (rename(tmp, path) < 0)
+ goto out;
+ } else {
+ unlink(tmp);
+ }
ret = 0;
out:
if (ret) {
error_errno("unable to update %s", path);
- if (fp)
- fclose(fp);
+ if (uic.cur_fp)
+ fclose(uic.cur_fp);
else if (fd >= 0)
close(fd);
unlink(tmp);
}
free(tmp);
+ if (uic.old_fp)
+ fclose(uic.old_fp);
+ strbuf_release(&uic.old_sb);
+ strbuf_release(&uic.cur_sb);
return ret;
}
static int add_info_ref(const char *path, const struct object_id *oid,
int flag, void *cb_data)
{
- FILE *fp = cb_data;
+ struct update_info_ctx *uic = cb_data;
struct object *o = parse_object(the_repository, oid);
if (!o)
return -1;
- if (fprintf(fp, "%s %s\n", oid_to_hex(oid), path) < 0)
+ if (uic_printf(uic, "%s %s\n", oid_to_hex(oid), path) < 0)
return -1;
if (o->type == OBJ_TAG) {
o = deref_tag(the_repository, o, path, 0);
if (o)
- if (fprintf(fp, "%s %s^{}\n",
+ if (uic_printf(uic, "%s %s^{}\n",
oid_to_hex(&o->oid), path) < 0)
return -1;
}
return 0;
}
-static int generate_info_refs(FILE *fp)
+static int generate_info_refs(struct update_info_ctx *uic)
{
- return for_each_ref(add_info_ref, fp);
+ return for_each_ref(add_info_ref, uic);
}
-static int update_info_refs(void)
+static int update_info_refs(int force)
{
char *path = git_pathdup("info/refs");
- int ret = update_info_file(path, generate_info_refs);
+ int ret = update_info_file(path, generate_info_refs, force);
free(path);
return ret;
}
free(info);
}
-static int write_pack_info_file(FILE *fp)
+static int write_pack_info_file(struct update_info_ctx *uic)
{
int i;
for (i = 0; i < num_pack; i++) {
- if (fprintf(fp, "P %s\n", pack_basename(info[i]->p)) < 0)
+ if (uic_printf(uic, "P %s\n", pack_basename(info[i]->p)) < 0)
return -1;
}
- if (fputc('\n', fp) == EOF)
+ if (uic_printf(uic, "\n") < 0)
return -1;
return 0;
}
int ret;
init_pack_info(infofile, force);
- ret = update_info_file(infofile, write_pack_info_file);
+ ret = update_info_file(infofile, write_pack_info_file, force);
free_pack_info();
free(infofile);
return ret;
*/
int errs = 0;
- errs = errs | update_info_refs();
+ errs = errs | update_info_refs(force);
errs = errs | update_info_packs(force);
/* remove leftover rev-cache file if there is any */
#include "dir.h"
#include "string-list.h"
#include "chdir-notify.h"
+#include "promisor-remote.h"
static int inside_git_dir = -1;
static int inside_work_tree = -1;
}
repository_format_precious_objects = candidate->precious_objects;
- repository_format_partial_clone = xstrdup_or_null(candidate->partial_clone);
+ set_repository_format_partial_clone(candidate->partial_clone);
repository_format_worktree_config = candidate->worktree_config;
string_list_clear(&candidate->unknown_extensions, 0);
#include "mergesort.h"
#include "quote.h"
#include "packfile.h"
-#include "fetch-object.h"
#include "object-store.h"
+#include "promisor-remote.h"
/* The maximum size for an object header. */
#define MAX_HEADER_LEN 32
return ref_git;
}
+static void fill_alternate_refs_command(struct child_process *cmd,
+ const char *repo_path)
+{
+ const char *value;
+
+ if (!git_config_get_value("core.alternateRefsCommand", &value)) {
+ cmd->use_shell = 1;
+
+ argv_array_push(&cmd->args, value);
+ argv_array_push(&cmd->args, repo_path);
+ } else {
+ cmd->git_cmd = 1;
+
+ argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path);
+ argv_array_push(&cmd->args, "for-each-ref");
+ argv_array_push(&cmd->args, "--format=%(objectname)");
+
+ if (!git_config_get_value("core.alternateRefsPrefixes", &value)) {
+ argv_array_push(&cmd->args, "--");
+ argv_array_split(&cmd->args, value);
+ }
+ }
+
+ cmd->env = local_repo_env;
+ cmd->out = -1;
+}
+
+static void read_alternate_refs(const char *path,
+ alternate_ref_fn *cb,
+ void *data)
+{
+ struct child_process cmd = CHILD_PROCESS_INIT;
+ struct strbuf line = STRBUF_INIT;
+ FILE *fh;
+
+ fill_alternate_refs_command(&cmd, path);
+
+ if (start_command(&cmd))
+ return;
+
+ fh = xfdopen(cmd.out, "r");
+ while (strbuf_getline_lf(&line, fh) != EOF) {
+ struct object_id oid;
+ const char *p;
+
+ if (parse_oid_hex(line.buf, &oid, &p) || *p) {
+ warning(_("invalid line while parsing alternate refs: %s"),
+ line.buf);
+ break;
+ }
+
+ cb(&oid, data);
+ }
+
+ fclose(fh);
+ finish_command(&cmd);
+ strbuf_release(&line);
+}
+
+struct alternate_refs_data {
+ alternate_ref_fn *fn;
+ void *data;
+};
+
+static int refs_from_alternate_cb(struct object_directory *e,
+ void *data)
+{
+ struct strbuf path = STRBUF_INIT;
+ size_t base_len;
+ struct alternate_refs_data *cb = data;
+
+ if (!strbuf_realpath(&path, e->path, 0))
+ goto out;
+ if (!strbuf_strip_suffix(&path, "/objects"))
+ goto out;
+ base_len = path.len;
+
+ /* Is this a git repository with refs? */
+ strbuf_addstr(&path, "/refs");
+ if (!is_directory(path.buf))
+ goto out;
+ strbuf_setlen(&path, base_len);
+
+ read_alternate_refs(path.buf, cb->fn, cb->data);
+
+out:
+ strbuf_release(&path);
+ return 0;
+}
+
+void for_each_alternate_ref(alternate_ref_fn fn, void *data)
+{
+ struct alternate_refs_data cb;
+ cb.fn = fn;
+ cb.data = data;
+ foreach_alt_odb(refs_from_alternate_cb, &cb);
+}
+
int foreach_alt_odb(alt_odb_fn fn, void *cb)
{
struct object_directory *ent;
mmap_limit_check(length);
ret = mmap(start, length, prot, flags, fd, offset);
- if (ret == MAP_FAILED) {
- if (!length)
- return NULL;
- release_pack_memory(length);
- ret = mmap(start, length, prot, flags, fd, offset);
- }
+ if (ret == MAP_FAILED && !length)
+ ret = NULL;
return ret;
}
}
/* Check if it is a missing object */
- if (fetch_if_missing && repository_format_partial_clone &&
+ if (fetch_if_missing && has_promisor_remote() &&
!already_retried && r == the_repository &&
!(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
/*
- * TODO Investigate having fetch_object() return
- * TODO error/success and stopping the music here.
- * TODO Pass a repository struct through fetch_object,
- * such that arbitrary repositories work.
+ * TODO Investigate checking promisor_remote_get_direct()
+ * TODO return value and stopping on error here.
+ * TODO Pass a repository struct through
+ * promisor_remote_get_direct(), such that arbitrary
+ * repositories work.
*/
- fetch_objects(repository_format_partial_clone, real, 1);
+ promisor_remote_get_direct(r, real, 1);
already_retried = 1;
continue;
}
return NULL;
}
-void *read_object_with_reference(const struct object_id *oid,
+void *read_object_with_reference(struct repository *r,
+ const struct object_id *oid,
const char *required_type_name,
unsigned long *size,
struct object_id *actual_oid_return)
int ref_length = -1;
const char *ref_type = NULL;
- buffer = read_object_file(&actual_oid, &type, &isize);
+ buffer = repo_read_object_file(r, &actual_oid, &type, &isize);
if (!buffer)
return NULL;
if (type == required_type) {
return collect_ambiguous(oid, data);
}
-static struct repository *sort_ambiguous_repo;
-static int sort_ambiguous(const void *a, const void *b)
+static int sort_ambiguous(const void *a, const void *b, void *ctx)
{
+ struct repository *sort_ambiguous_repo = ctx;
int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
int a_type_sort;
static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
{
- /* mutex will be needed if this code is to be made thread safe */
- sort_ambiguous_repo = r;
- QSORT(a->oid, a->nr, sort_ambiguous);
- sort_ambiguous_repo = NULL;
+ QSORT_S(a->oid, a->nr, sort_ambiguous, r);
}
static enum get_oid_result get_short_oid(struct repository *r,
* or migrated from loose to packed.
*/
if (status == MISSING_OBJECT) {
- reprepare_packed_git(the_repository);
+ reprepare_packed_git(r);
find_short_object_filename(&ds);
find_short_packed_object(&ds);
status = finish_object_disambiguation(&ds, oid);
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
- " git checkout -b $br $(git rev-parse ...)\n"
+ " git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
two = lookup_commit_reference_gently(r, &oid_tmp, 0);
if (!two)
return -1;
- if (r != the_repository)
- BUG("sorry get_merge_bases() can't take struct repository yet");
- mbs = get_merge_bases(one, two);
+ mbs = repo_get_merge_bases(r, one, two);
if (!mbs || mbs->next)
st = -1;
else {
}
/* Must be called only when object_name:filename doesn't exist. */
-static void diagnose_invalid_oid_path(const char *prefix,
+static void diagnose_invalid_oid_path(struct repository *r,
+ const char *prefix,
const char *filename,
const struct object_id *tree_oid,
const char *object_name,
if (is_missing_file_error(errno)) {
char *fullname = xstrfmt("%s%s", prefix, filename);
- if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) {
+ if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
die("Path '%s' exists, but not '%s'.\n"
"Did you mean '%.*s:%s' aka '%.*s:./%s'?",
fullname,
new_filename = resolve_relative_path(repo, filename);
if (new_filename)
filename = new_filename;
- /*
- * NEEDSWORK: Eventually get_tree_entry*() should
- * learn to take struct repository directly and we
- * would not need to inject submodule odb to the
- * in-core odb.
- */
- if (repo != the_repository)
- add_to_alternates_memory(repo->objects->odb->path);
if (flags & GET_OID_FOLLOW_SYMLINKS) {
- ret = get_tree_entry_follow_symlinks(&tree_oid,
+ ret = get_tree_entry_follow_symlinks(repo, &tree_oid,
filename, oid, &oc->symlink_path,
&oc->mode);
} else {
- ret = get_tree_entry(&tree_oid, filename, oid,
+ ret = get_tree_entry(repo, &tree_oid, filename, oid,
&oc->mode);
if (ret && only_to_die) {
- diagnose_invalid_oid_path(prefix,
+ diagnose_invalid_oid_path(repo, prefix,
filename,
&tree_oid,
name, len);
if (r->parsed_objects->is_shallow == -1)
BUG("shallow must be initialized by now");
- if (!stat_validity_check(r->parsed_objects->shallow_stat, git_path_shallow(the_repository)))
+ if (!stat_validity_check(r->parsed_objects->shallow_stat,
+ git_path_shallow(r)))
die("shallow file has changed since we read it");
}
}
}
-static int is_rfc3986_reserved(char ch)
+int is_rfc3986_reserved_or_unreserved(char ch)
{
+ if (is_rfc3986_unreserved(ch))
+ return 1;
switch (ch) {
case '!': case '*': case '\'': case '(': case ')': case ';':
case ':': case '@': case '&': case '=': case '+': case '$':
return 0;
}
-static int is_rfc3986_unreserved(char ch)
+int is_rfc3986_unreserved(char ch)
{
return isalnum(ch) ||
ch == '-' || ch == '_' || ch == '.' || ch == '~';
}
static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
- int reserved)
+ char_predicate allow_unencoded_fn)
{
strbuf_grow(sb, len);
while (len--) {
char ch = *s++;
- if (is_rfc3986_unreserved(ch) ||
- (!reserved && is_rfc3986_reserved(ch)))
+ if (allow_unencoded_fn(ch))
strbuf_addch(sb, ch);
else
strbuf_addf(sb, "%%%02x", (unsigned char)ch);
}
void strbuf_addstr_urlencode(struct strbuf *sb, const char *s,
- int reserved)
+ char_predicate allow_unencoded_fn)
{
- strbuf_add_urlencode(sb, s, strlen(s), reserved);
+ strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn);
}
-void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+static void strbuf_humanise(struct strbuf *buf, off_t bytes,
+ int humanise_rate)
{
if (bytes > 1 << 30) {
- strbuf_addf(buf, "%u.%2.2u GiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 gibibyte */
+ _("%u.%2.2u GiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */
+ _("%u.%2.2u GiB/s"),
(unsigned)(bytes >> 30),
(unsigned)(bytes & ((1 << 30) - 1)) / 10737419);
} else if (bytes > 1 << 20) {
unsigned x = bytes + 5243; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u MiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 mebibyte */
+ _("%u.%2.2u MiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */
+ _("%u.%2.2u MiB/s"),
x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
} else if (bytes > 1 << 10) {
unsigned x = bytes + 5; /* for rounding */
- strbuf_addf(buf, "%u.%2.2u KiB",
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 kibibyte */
+ _("%u.%2.2u KiB") :
+ /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */
+ _("%u.%2.2u KiB/s"),
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
} else {
- strbuf_addf(buf, "%u bytes", (unsigned)bytes);
+ strbuf_addf(buf,
+ humanise_rate == 0 ?
+ /* TRANSLATORS: IEC 80000-13:2008 byte */
+ Q_("%u byte", "%u bytes", (unsigned)bytes) :
+ /* TRANSLATORS: IEC 80000-13:2008 byte/second */
+ Q_("%u byte/s", "%u bytes/s", (unsigned)bytes),
+ (unsigned)bytes);
}
}
+void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
+{
+ strbuf_humanise(buf, bytes, 0);
+}
+
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
+{
+ strbuf_humanise(buf, bytes, 1);
+}
+
void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
{
if (!*path)
*/
void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes);
+/**
+ * Append the given byte rate as a human-readable string (i.e. 12.23 KiB/s,
+ * 3.50 MiB/s).
+ */
+void strbuf_humanise_rate(struct strbuf *buf, off_t bytes);
+
/**
* Add a formatted string to the buffer.
*/
*/
int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
+typedef int (*char_predicate)(char ch);
+
+int is_rfc3986_unreserved(char ch);
+int is_rfc3986_reserved_or_unreserved(char ch);
+
void strbuf_addstr_urlencode(struct strbuf *sb, const char *name,
- int reserved);
+ char_predicate allow_unencoded_fn);
__attribute__((format (printf,1,2)))
int printf_ln(const char *fmt, ...);
if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
if (old_head) {
if (!submodule_uses_gitfile(path))
- absorb_git_dir_into_superproject("", path,
+ absorb_git_dir_into_superproject(path,
ABSORB_GITDIR_RECURSE_SUBMODULES);
} else {
char *gitdir = xstrfmt("%s/modules/%s",
* Embeds a single submodules git directory into the superprojects git dir,
* non recursively.
*/
-static void relocate_single_git_dir_into_superproject(const char *prefix,
- const char *path)
+static void relocate_single_git_dir_into_superproject(const char *path)
{
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
const char *new_git_dir;
* having its git directory within the working tree to the git dir nested
* in its superprojects git dir under modules/.
*/
-void absorb_git_dir_into_superproject(const char *prefix,
- const char *path,
+void absorb_git_dir_into_superproject(const char *path,
unsigned flags)
{
int err_code;
char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);
if (!starts_with(real_sub_git_dir, real_common_git_dir))
- relocate_single_git_dir_into_superproject(prefix, path);
+ relocate_single_git_dir_into_superproject(path);
free(real_sub_git_dir);
free(real_common_git_dir);
void prepare_submodule_repo_env(struct argv_array *out);
#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
-void absorb_git_dir_into_superproject(const char *prefix,
- const char *path,
+void absorb_git_dir_into_superproject(const char *path,
unsigned flags);
/*
could be enabled by running the test suite with correct GIT_TEST_
environment set.
-GIT_TEST_GETTEXT_POISON=<non-empty?> turns all strings marked for
-translation into gibberish if non-empty (think "test -n"). Used for
-spotting those tests that need to be marked with a C_LOCALE_OUTPUT
-prerequisite when adding more strings for translation. See "Testing
-marked strings" in po/README for details.
+GIT_TEST_FAIL_PREREQS=<boolean> fails all prerequisites. This is
+useful for discovering issues with the tests where say a later test
+implicitly depends on an optional earlier test.
+
+There's a "FAIL_PREREQS" prerequisite that can be used to test for
+whether this mode is active, and e.g. skip some tests that are hard to
+refactor to deal with it. The "SYMLINKS" prerequisite is currently
+excluded as so much relies on it, but this might change in the future.
+
+GIT_TEST_GETTEXT_POISON=<boolean> turns all strings marked for
+translation into gibberish if true. Used for spotting those tests that
+need to be marked with a C_LOCALE_OUTPUT prerequisite when adding more
+strings for translation. See "Testing marked strings" in po/README for
+details.
GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
test suite. Accept any boolean values that are accepted by git-config.
--- /dev/null
+#include "test-tool.h"
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "iterator.h"
+#include "dir-iterator.h"
+
+static const char *error_name(int error_number)
+{
+ switch (error_number) {
+ case ENOENT: return "ENOENT";
+ case ENOTDIR: return "ENOTDIR";
+ default: return "ESOMETHINGELSE";
+ }
+}
+
+/*
+ * usage:
+ * tool-test dir-iterator [--follow-symlinks] [--pedantic] directory_path
+ */
+int cmd__dir_iterator(int argc, const char **argv)
+{
+ struct dir_iterator *diter;
+ unsigned int flags = 0;
+ int iter_status;
+
+ for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
+ if (strcmp(*argv, "--follow-symlinks") == 0)
+ flags |= DIR_ITERATOR_FOLLOW_SYMLINKS;
+ else if (strcmp(*argv, "--pedantic") == 0)
+ flags |= DIR_ITERATOR_PEDANTIC;
+ else
+ die("invalid option '%s'", *argv);
+ }
+
+ if (!*argv || argc != 1)
+ die("dir-iterator needs exactly one non-option argument");
+
+ diter = dir_iterator_begin(*argv, flags);
+
+ if (!diter) {
+ printf("dir_iterator_begin failure: %s\n", error_name(errno));
+ exit(EXIT_FAILURE);
+ }
+
+ while ((iter_status = dir_iterator_advance(diter)) == ITER_OK) {
+ if (S_ISDIR(diter->st.st_mode))
+ printf("[d] ");
+ else if (S_ISREG(diter->st.st_mode))
+ printf("[f] ");
+ else if (S_ISLNK(diter->st.st_mode))
+ printf("[s] ");
+ else
+ printf("[?] ");
+
+ printf("(%s) [%s] %s\n", diter->relative_path, diter->basename,
+ diter->path.buf);
+ }
+
+ if (iter_status != ITER_DONE) {
+ printf("dir_iterator_advance failure\n");
+ return 1;
+ }
+
+ return 0;
+}
* Add 2 objects, one with a non-NULL decoration and one with a NULL
* decoration.
*/
- one = lookup_unknown_object(one_oid.hash);
- two = lookup_unknown_object(two_oid.hash);
+ one = lookup_unknown_object(&one_oid);
+ two = lookup_unknown_object(&two_oid);
ret = add_decoration(&n, one, &decoration_a);
if (ret)
BUG("when adding a brand-new object, NULL should be returned");
ret = lookup_decoration(&n, two);
if (ret != &decoration_b)
BUG("lookup should return added declaration");
- three = lookup_unknown_object(three_oid.hash);
+ three = lookup_unknown_object(&three_oid);
ret = lookup_decoration(&n, three);
if (ret)
BUG("lookup for unknown object should return NULL");
p2 = strtok(NULL, DELIM);
}
- if (!strcmp("hash", cmd) && p1) {
-
- /* print results of different hash functions */
- printf("%u %u %u %u\n",
- strhash(p1), memhash(p1, strlen(p1)),
- strihash(p1), memihash(p1, strlen(p1)));
-
- } else if (!strcmp("add", cmd) && p1 && p2) {
+ if (!strcmp("add", cmd) && p1 && p2) {
/* create entry with key = p1, value = p2 */
entry = alloc_test_entry(hash, p1, p2);
if (!two)
die("not a tree-ish %s", av[2]);
- shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
+ shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
printf("shifted: %s\n", oid_to_hex(&shifted));
exit(0);
--- /dev/null
+#include "test-tool.h"
+#include "cache.h"
+#include "oidmap.h"
+#include "strbuf.h"
+
+/* key is an oid and value is a name (could be a refname for example) */
+struct test_entry {
+ struct oidmap_entry entry;
+ char name[FLEX_ARRAY];
+};
+
+#define DELIM " \t\r\n"
+
+/*
+ * Read stdin line by line and print result of commands to stdout:
+ *
+ * hash oidkey -> sha1hash(oidkey)
+ * put oidkey namevalue -> NULL / old namevalue
+ * get oidkey -> NULL / namevalue
+ * remove oidkey -> NULL / old namevalue
+ * iterate -> oidkey1 namevalue1\noidkey2 namevalue2\n...
+ *
+ */
+int cmd__oidmap(int argc, const char **argv)
+{
+ struct strbuf line = STRBUF_INIT;
+ struct oidmap map = OIDMAP_INIT;
+
+ setup_git_directory();
+
+ /* init oidmap */
+ oidmap_init(&map, 0);
+
+ /* process commands from stdin */
+ while (strbuf_getline(&line, stdin) != EOF) {
+ char *cmd, *p1 = NULL, *p2 = NULL;
+ struct test_entry *entry;
+ struct object_id oid;
+
+ /* break line into command and up to two parameters */
+ cmd = strtok(line.buf, DELIM);
+ /* ignore empty lines */
+ if (!cmd || *cmd == '#')
+ continue;
+
+ p1 = strtok(NULL, DELIM);
+ if (p1)
+ p2 = strtok(NULL, DELIM);
+
+ if (!strcmp("put", cmd) && p1 && p2) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* create entry with oid_key = p1, name_value = p2 */
+ FLEX_ALLOC_STR(entry, name, p2);
+ oidcpy(&entry->entry.oid, &oid);
+
+ /* add / replace entry */
+ entry = oidmap_put(&map, entry);
+
+ /* print and free replaced entry, if any */
+ puts(entry ? entry->name : "NULL");
+ free(entry);
+
+ } else if (!strcmp("get", cmd) && p1) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* lookup entry in oidmap */
+ entry = oidmap_get(&map, &oid);
+
+ /* print result */
+ puts(entry ? entry->name : "NULL");
+
+ } else if (!strcmp("remove", cmd) && p1) {
+
+ if (get_oid(p1, &oid)) {
+ printf("Unknown oid: %s\n", p1);
+ continue;
+ }
+
+ /* remove entry from oidmap */
+ entry = oidmap_remove(&map, &oid);
+
+ /* print result and free entry*/
+ puts(entry ? entry->name : "NULL");
+ free(entry);
+
+ } else if (!strcmp("iterate", cmd)) {
+
+ struct oidmap_iter iter;
+ oidmap_iter_init(&map, &iter);
+ while ((entry = oidmap_iter_next(&iter)))
+ printf("%s %s\n", oid_to_hex(&entry->entry.oid), entry->name);
+
+ } else {
+
+ printf("Unknown command %s\n", cmd);
+
+ }
+ }
+
+ strbuf_release(&line);
+ oidmap_free(&map, 1);
+ return 0;
+}
{ "ctype", cmd__ctype },
{ "date", cmd__date },
{ "delta", cmd__delta },
+ { "dir-iterator", cmd__dir_iterator },
{ "drop-caches", cmd__drop_caches },
{ "dump-cache-tree", cmd__dump_cache_tree },
{ "dump-fsmonitor", cmd__dump_fsmonitor },
{ "match-trees", cmd__match_trees },
{ "mergesort", cmd__mergesort },
{ "mktemp", cmd__mktemp },
+ { "oidmap", cmd__oidmap },
{ "online-cpus", cmd__online_cpus },
{ "parse-options", cmd__parse_options },
{ "path-utils", cmd__path_utils },
int cmd__ctype(int argc, const char **argv);
int cmd__date(int argc, const char **argv);
int cmd__delta(int argc, const char **argv);
+int cmd__dir_iterator(int argc, const char **argv);
int cmd__drop_caches(int argc, const char **argv);
int cmd__dump_cache_tree(int argc, const char **argv);
int cmd__dump_fsmonitor(int argc, const char **argv);
int cmd__match_trees(int argc, const char **argv);
int cmd__mergesort(int argc, const char **argv);
int cmd__mktemp(int argc, const char **argv);
+int cmd__oidmap(int argc, const char **argv);
int cmd__online_cpus(int argc, const char **argv);
int cmd__parse_options(int argc, const char **argv);
int cmd__path_utils(int argc, const char **argv);
#
# test_done
-test_tristate GIT_TEST_GIT_DAEMON
-if test "$GIT_TEST_GIT_DAEMON" = false
+if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
then
skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)"
test_done
if test_have_prereq !PIPE
then
- test_skip_or_die $GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
+ test_skip_or_die GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
fi
test_set_port LIB_GIT_DAEMON_PORT
kill "$GIT_DAEMON_PID"
wait "$GIT_DAEMON_PID"
unset GIT_DAEMON_PID
- test_skip_or_die $GIT_TEST_GIT_DAEMON \
+ test_skip_or_die GIT_TEST_GIT_DAEMON \
"git daemon failed to start"
fi
}
maybe_start_httpd () {
loc=${1-svn}
- test_tristate GIT_SVN_TEST_HTTPD
- case $GIT_SVN_TEST_HTTPD in
- true)
+ if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD
+ then
. "$TEST_DIRECTORY"/lib-httpd.sh
LIB_HTTPD_SVN="$loc"
start_httpd
- ;;
- esac
+ fi
}
convert_to_rev_db () {
}
require_svnserve () {
- test_tristate GIT_TEST_SVNSERVE
- if ! test "$GIT_TEST_SVNSERVE" = true
+ if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE
then
skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
test_done
test_done
fi
-test_tristate GIT_TEST_HTTPD
-if test "$GIT_TEST_HTTPD" = false
+if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD
then
skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)"
test_done
fi
if ! test_have_prereq NOT_ROOT; then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Cannot run httpd tests as root"
fi
if ! test -x "$LIB_HTTPD_PATH"
then
- test_skip_or_die $GIT_TEST_HTTPD "no web server found at '$LIB_HTTPD_PATH'"
+ test_skip_or_die GIT_TEST_HTTPD "no web server found at '$LIB_HTTPD_PATH'"
fi
HTTPD_VERSION=$($LIB_HTTPD_PATH -v | \
then
if ! test $HTTPD_VERSION -ge 2
then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"at least Apache version 2 is required"
fi
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
then
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Apache module directory not found"
fi
LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
fi
else
- test_skip_or_die $GIT_TEST_HTTPD \
+ test_skip_or_die GIT_TEST_HTTPD \
"Could not identify web server at '$LIB_HTTPD_PATH'"
fi
if test $? -ne 0
then
cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
- test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
+ test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
fi
}
. ./test-lib.sh
+# set_state <path> <worktree-content> <index-content>
+#
+# Prepare the content for path in worktree and the index as specified.
set_state () {
echo "$3" > "$1" &&
git add "$1" &&
echo "$2" > "$1"
}
+# save_state <path>
+#
+# Save index/worktree content of <path> in the files _worktree_<path>
+# and _index_<path>
save_state () {
noslash="$(echo "$1" | tr / _)" &&
cat "$1" > _worktree_"$noslash" &&
git show :"$1" > _index_"$noslash"
}
+# set_and_save_state <path> <worktree-content> <index-content>
set_and_save_state () {
set_state "$@" &&
save_state "$1"
}
+# verify_state <path> <expected-worktree-content> <expected-index-content>
verify_state () {
test "$(cat "$1")" = "$2" &&
test "$(git show :"$1")" = "$3"
}
+# verify_saved_state <path>
+#
+# Call verify_state with expected contents from the last save_state
verify_saved_state () {
noslash="$(echo "$1" | tr / _)" &&
verify_state "$1" "$(cat _worktree_"$noslash")" "$(cat _index_"$noslash")"
rm -f "$1"
echo 'rebase -i script before editing:'
cat "$1".tmp
- action=pick
+ action=\&
for line in $FAKE_LINES; do
case $line in
- pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
+ pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
action="$line";;
exec_*|x_*|break|b)
echo "$line" | sed 's/_/ /g' >> "$1";;
bad)
action="badcmd";;
fakesha)
+ test \& != "$action" || action=pick
echo "$action XXXXXXX False commit" >> "$1"
action=pick;;
*)
- sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
- action=pick;;
+ sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
+ action=\&;;
esac
done
echo 'rebase -i script after editing:'
--- /dev/null
+#!/bin/sh
+
+test_description='speed of clone --reference'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+test_expect_success 'create shareable repository' '
+ git clone --bare . shared.git
+'
+
+test_expect_success 'advance base repository' '
+ # Do not use test_commit here; its test_tick will
+ # use some ancient hard-coded date. The resulting clock
+ # skew will cause pack-objects to traverse in a very
+ # sub-optimal order, skewing the results.
+ echo content >new-file-that-does-not-exist &&
+ git add new-file-that-does-not-exist &&
+ git commit -m "new commit"
+'
+
+test_perf 'clone --reference' '
+ rm -rf dst.git &&
+ git clone --no-local --bare --reference shared.git . dst.git
+'
+
+test_done
echo "$x"
}
-# This test is an experiment to check whether any Git users are using
-# Shells that don't support the "local" keyword. "local" is not
+# Check whether the shell supports the "local" keyword. "local" is not
# POSIX-standard, but it is very widely supported by POSIX-compliant
-# shells, and if it doesn't cause problems for people, we would like
-# to be able to use it in Git code.
+# shells, and we rely on it within Git's test framework.
#
-# For now, this is the only test that requires "local". If your shell
-# fails this test, you can ignore the failure, but please report the
-# problem to the Git mailing list <git@vger.kernel.org>, as it might
-# convince us to continue avoiding the use of "local".
+# If your shell fails this test, the results of other tests may be
+# unreliable. You may wish to report the problem to the Git mailing
+# list <git@vger.kernel.org>, as it could cause us to reconsider
+# relying on "local".
test_expect_success 'verify that the running shell supports "local"' '
x="notlocal" &&
echo "local" >expected1 &&
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
test_must_fail run_sub_test_lib_test \
- test-verbose "test verbose" --verbose <<-\EOF &&
+ t1234-verbose "test verbose" --verbose <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
test_done
EOF
- mv test-verbose/out test-verbose/out+ &&
- grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
- check_sub_test_lib_test test-verbose <<-\EOF
- > expecting success: true
+ mv t1234-verbose/out t1234-verbose/out+ &&
+ grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
+ check_sub_test_lib_test t1234-verbose <<-\EOF
+ > expecting success of 1234.1 '\''passing test'\'': true
> ok 1 - passing test
> Z
- > expecting success: echo foo
+ > expecting success of 1234.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
- > expecting success: false
+ > expecting success of 1234.3 '\''failing test'\'': false
> not ok 3 - failing test
> # false
> Z
test_expect_success 'test --verbose-only' '
test_must_fail run_sub_test_lib_test \
- test-verbose-only-2 "test verbose-only=2" \
+ t2345-verbose-only-2 "test verbose-only=2" \
--verbose-only=2 <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
test_expect_success "failing test" false
test_done
EOF
- check_sub_test_lib_test test-verbose-only-2 <<-\EOF
+ check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
> ok 1 - passing test
> Z
- > expecting success: echo foo
+ > expecting success of 2345.2 '\''test with output'\'': echo foo
> foo
> ok 2 - test with output
> Z
test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
donthaveit=no
'
-if test $haveit$donthaveit != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes
then
say "bug in test framework: prerequisite tags do not work reliably"
exit 1
test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
donthaveiteither=no
'
-if test $haveit$donthaveit$donthaveiteither != yesyesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes
then
say "bug in test framework: multiple prerequisite tags do not work reliably"
exit 1
donthavetrue=no
'
-if test "$havetrue$donthavetrue" != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$havetrue$donthavetrue" != yesyes
then
say 'bug in test framework: lazy prerequisites do not work'
exit 1
havefalse=no
'
-if test "$nothavefalse$havefalse" != yesyes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$nothavefalse$havefalse" != yesyes
then
say 'bug in test framework: negative lazy prerequisites do not work'
exit 1
test_when_finished clean=yes
'
-if test $clean != yes
+if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $clean != yes
then
say "bug in test framework: basic cleanup command does not work reliably"
exit 1
GIT_REDIRECT_STDOUT=output.txt \
GIT_REDIRECT_STDERR="2>&1" \
git rev-parse --git-dir --verify refs/invalid &&
- printf ".git\nfatal: Needed a single revision\n" >expect &&
- test_cmp expect output.txt
+ grep "^\\.git\$" output.txt &&
+ grep "Needed a single revision" output.txt
'
test_done
test_cmp expect actual
'
-test_expect_success !AUTOIDENT 'requested identites are strict' '
+test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' '
(
sane_unset GIT_COMMITTER_NAME &&
sane_unset GIT_COMMITTER_EMAIL &&
test_cmp expect actual
}
-test_expect_success 'hash functions' '
-
-test_hashmap "hash key1" "2215982743 2215982743 116372151 116372151" &&
-test_hashmap "hash key2" "2215982740 2215982740 116372148 116372148" &&
-test_hashmap "hash fooBarFrotz" "1383912807 1383912807 3189766727 3189766727" &&
-test_hashmap "hash foobarfrotz" "2862305959 2862305959 3189766727 3189766727"
-
-'
-
test_expect_success 'put' '
test_hashmap "put key1 value1
'
test_expect_success 'iterate' '
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-iterate" "NULL
-NULL
-NULL
-key2 value2
-key1 value1
-fooBarFrotz value3"
-
+ test-tool hashmap >actual.raw <<-\EOF &&
+ put key1 value1
+ put key2 value2
+ put fooBarFrotz value3
+ iterate
+ EOF
+
+ cat >expect <<-\EOF &&
+ NULL
+ NULL
+ NULL
+ fooBarFrotz value3
+ key1 value1
+ key2 value2
+ EOF
+
+ sort <actual.raw >actual &&
+ test_cmp expect actual
'
test_expect_success 'iterate (case insensitive)' '
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-iterate" "NULL
-NULL
-NULL
-fooBarFrotz value3
-key2 value2
-key1 value1" ignorecase
-
+ test-tool hashmap ignorecase >actual.raw <<-\EOF &&
+ put key1 value1
+ put key2 value2
+ put fooBarFrotz value3
+ iterate
+ EOF
+
+ cat >expect <<-\EOF &&
+ NULL
+ NULL
+ NULL
+ fooBarFrotz value3
+ key1 value1
+ key2 value2
+ EOF
+
+ sort <actual.raw >actual &&
+ test_cmp expect actual
'
test_expect_success 'grow / shrink' '
--- /dev/null
+#!/bin/sh
+
+test_description='test oidmap'
+. ./test-lib.sh
+
+# This purposefully is very similar to t0011-hashmap.sh
+
+test_oidmap () {
+ echo "$1" | test-tool oidmap $3 >actual &&
+ echo "$2" >expect &&
+ test_cmp expect actual
+}
+
+
+test_expect_success 'setup' '
+
+ test_commit one &&
+ test_commit two &&
+ test_commit three &&
+ test_commit four
+
+'
+
+test_expect_success 'put' '
+
+test_oidmap "put one 1
+put two 2
+put invalidOid 4
+put three 3" "NULL
+NULL
+Unknown oid: invalidOid
+NULL"
+
+'
+
+test_expect_success 'replace' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+put invalidOid 4
+put two deux
+put one un" "NULL
+NULL
+NULL
+Unknown oid: invalidOid
+2
+1"
+
+'
+
+test_expect_success 'get' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+get two
+get four
+get invalidOid
+get one" "NULL
+NULL
+NULL
+2
+NULL
+Unknown oid: invalidOid
+1"
+
+'
+
+test_expect_success 'remove' '
+
+test_oidmap "put one 1
+put two 2
+put three 3
+remove one
+remove two
+remove invalidOid
+remove four" "NULL
+NULL
+NULL
+1
+2
+Unknown oid: invalidOid
+NULL"
+
+'
+
+test_expect_success 'iterate' '
+ test-tool oidmap >actual.raw <<-\EOF &&
+ put one 1
+ put two 2
+ put three 3
+ iterate
+ EOF
+
+ # sort "expect" too so we do not rely on the order of particular oids
+ sort >expect <<-EOF &&
+ NULL
+ NULL
+ NULL
+ $(git rev-parse one) 1
+ $(git rev-parse two) 2
+ $(git rev-parse three) 3
+ EOF
+
+ sort <actual.raw >actual &&
+ test_cmp expect actual
+'
+
+test_done
--- /dev/null
+#!/bin/sh
+
+test_description='test env--helper'
+
+. ./test-lib.sh
+
+
+test_expect_success 'env--helper usage' '
+ test_must_fail git env--helper &&
+ test_must_fail git env--helper --type=bool &&
+ test_must_fail git env--helper --type=ulong &&
+ test_must_fail git env--helper --type=bool &&
+ test_must_fail git env--helper --type=bool --default &&
+ test_must_fail git env--helper --type=bool --default= &&
+ test_must_fail git env--helper --defaultxyz
+'
+
+test_expect_success 'env--helper bad default values' '
+ test_must_fail git env--helper --type=bool --default=1xyz MISSING &&
+ test_must_fail git env--helper --type=ulong --default=1xyz MISSING
+'
+
+test_expect_success 'env--helper --type=bool' '
+ # Test various --default bool values
+ echo true >expected &&
+ git env--helper --type=bool --default=1 MISSING >actual &&
+ test_cmp expected actual &&
+ git env--helper --type=bool --default=yes MISSING >actual &&
+ test_cmp expected actual &&
+ git env--helper --type=bool --default=true MISSING >actual &&
+ test_cmp expected actual &&
+ echo false >expected &&
+ test_must_fail git env--helper --type=bool --default=0 MISSING >actual &&
+ test_cmp expected actual &&
+ test_must_fail git env--helper --type=bool --default=no MISSING >actual &&
+ test_cmp expected actual &&
+ test_must_fail git env--helper --type=bool --default=false MISSING >actual &&
+ test_cmp expected actual &&
+
+ # No output with --exit-code
+ git env--helper --type=bool --default=true --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+ test_must_fail git env--helper --type=bool --default=false --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ # Existing variable
+ EXISTS=true git env--helper --type=bool --default=false --exit-code EXISTS >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+ test_must_fail \
+ env EXISTS=false \
+ git env--helper --type=bool --default=true --exit-code EXISTS >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
+'
+
+test_expect_success 'env--helper --type=ulong' '
+ echo 1234567890 >expected &&
+ git env--helper --type=ulong --default=1234567890 MISSING >actual.out 2>actual.err &&
+ test_cmp expected actual.out &&
+ test_must_be_empty actual.err &&
+
+ echo 0 >expected &&
+ test_must_fail git env--helper --type=ulong --default=0 MISSING >actual &&
+ test_cmp expected actual &&
+
+ git env--helper --type=ulong --default=1234567890 --exit-code MISSING >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ EXISTS=1234567890 git env--helper --type=ulong --default=0 EXISTS --exit-code >actual.out 2>actual.err &&
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err &&
+
+ echo 1234567890 >expected &&
+ EXISTS=1234567890 git env--helper --type=ulong --default=0 EXISTS >actual.out 2>actual.err &&
+ test_cmp expected actual.out &&
+ test_must_be_empty actual.err
+'
+
+test_expect_success 'env--helper reads config thanks to trace2' '
+ mkdir home &&
+ git config -f home/.gitconfig include.path cycle &&
+ git config -f home/cycle include.path .gitconfig &&
+
+ test_must_fail \
+ env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=false \
+ git config -l 2>err &&
+ grep "exceeded maximum include depth" err &&
+
+ test_must_fail \
+ env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=true \
+ git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON 2>err &&
+ grep "# GETTEXT POISON #" err
+'
+
+test_done
EOF
test_cmp_exclude_clean expected.log debug.log &&
+ # Make sure that the file appears dirty, so checkout below has to
+ # run the configured filter.
+ touch test.r &&
filter_git checkout --quiet --no-progress empty-branch &&
cat >expected.log <<-EOF &&
START
pfx=$1
exp=$2.expect
act=$pfx.actual.$3
- tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" >"$exp" &&
- tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" >"$act" &&
+ tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" |
+ sed -e "s/0000*/$ZERO_OID/" >"$exp" &&
+ tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" |
+ sed -e "s/0000*/$ZERO_OID/" >"$act" &&
test_cmp "$exp" "$act" &&
rm "$exp" "$act"
}
test-tool parse-options --ye
'
+test_expect_success '--end-of-options treats remainder as args' '
+ test-tool parse-options \
+ --expect="verbose: -1" \
+ --expect="arg 00: --verbose" \
+ --end-of-options --verbose
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='Test the dir-iterator functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ mkdir -p dir &&
+ mkdir -p dir/a/b/c/ &&
+ >dir/b &&
+ >dir/c &&
+ mkdir -p dir/d/e/d/ &&
+ >dir/a/b/c/d &&
+ >dir/a/e &&
+ >dir/d/e/d/a &&
+
+ mkdir -p dir2/a/b/c/ &&
+ >dir2/a/b/c/d
+'
+
+test_expect_success 'dir-iterator should iterate through all files' '
+ cat >expected-iteration-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir/a
+ [d] (a/b) [b] ./dir/a/b
+ [d] (a/b/c) [c] ./dir/a/b/c
+ [d] (d) [d] ./dir/d
+ [d] (d/e) [e] ./dir/d/e
+ [d] (d/e/d) [d] ./dir/d/e/d
+ [f] (a/b/c/d) [d] ./dir/a/b/c/d
+ [f] (a/e) [e] ./dir/a/e
+ [f] (b) [b] ./dir/b
+ [f] (c) [c] ./dir/c
+ [f] (d/e/d/a) [a] ./dir/d/e/d/a
+ EOF
+
+ test-tool dir-iterator ./dir >out &&
+ sort out >./actual-iteration-sorted-output &&
+
+ test_cmp expected-iteration-sorted-output actual-iteration-sorted-output
+'
+
+test_expect_success 'dir-iterator should list files in the correct order' '
+ cat >expected-pre-order-output <<-EOF &&
+ [d] (a) [a] ./dir2/a
+ [d] (a/b) [b] ./dir2/a/b
+ [d] (a/b/c) [c] ./dir2/a/b/c
+ [f] (a/b/c/d) [d] ./dir2/a/b/c/d
+ EOF
+
+ test-tool dir-iterator ./dir2 >actual-pre-order-output &&
+
+ test_cmp expected-pre-order-output actual-pre-order-output
+'
+
+test_expect_success 'begin should fail upon inexistent paths' '
+ test_must_fail test-tool dir-iterator ./inexistent-path \
+ >actual-inexistent-path-output &&
+ echo "dir_iterator_begin failure: ENOENT" >expected-inexistent-path-output &&
+ test_cmp expected-inexistent-path-output actual-inexistent-path-output
+'
+
+test_expect_success 'begin should fail upon non directory paths' '
+ test_must_fail test-tool dir-iterator ./dir/b >actual-non-dir-output &&
+ echo "dir_iterator_begin failure: ENOTDIR" >expected-non-dir-output &&
+ test_cmp expected-non-dir-output actual-non-dir-output
+'
+
+test_expect_success POSIXPERM,SANITY 'advance should not fail on errors by default' '
+ cat >expected-no-permissions-output <<-EOF &&
+ [d] (a) [a] ./dir3/a
+ EOF
+
+ mkdir -p dir3/a &&
+ >dir3/a/b &&
+ chmod 0 dir3/a &&
+
+ test-tool dir-iterator ./dir3 >actual-no-permissions-output &&
+ test_cmp expected-no-permissions-output actual-no-permissions-output &&
+ chmod 755 dir3/a &&
+ rm -rf dir3
+'
+
+test_expect_success POSIXPERM,SANITY 'advance should fail on errors, w/ pedantic flag' '
+ cat >expected-no-permissions-pedantic-output <<-EOF &&
+ [d] (a) [a] ./dir3/a
+ dir_iterator_advance failure
+ EOF
+
+ mkdir -p dir3/a &&
+ >dir3/a/b &&
+ chmod 0 dir3/a &&
+
+ test_must_fail test-tool dir-iterator --pedantic ./dir3 \
+ >actual-no-permissions-pedantic-output &&
+ test_cmp expected-no-permissions-pedantic-output \
+ actual-no-permissions-pedantic-output &&
+ chmod 755 dir3/a &&
+ rm -rf dir3
+'
+
+test_expect_success SYMLINKS 'setup dirs with symlinks' '
+ mkdir -p dir4/a &&
+ mkdir -p dir4/b/c &&
+ >dir4/a/d &&
+ ln -s d dir4/a/e &&
+ ln -s ../b dir4/a/f &&
+
+ mkdir -p dir5/a/b &&
+ mkdir -p dir5/a/c &&
+ ln -s ../c dir5/a/b/d &&
+ ln -s ../ dir5/a/b/e &&
+ ln -s ../../ dir5/a/b/f
+'
+
+test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default' '
+ cat >expected-no-follow-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir4/a
+ [d] (b) [b] ./dir4/b
+ [d] (b/c) [c] ./dir4/b/c
+ [f] (a/d) [d] ./dir4/a/d
+ [s] (a/e) [e] ./dir4/a/e
+ [s] (a/f) [f] ./dir4/a/f
+ EOF
+
+ test-tool dir-iterator ./dir4 >out &&
+ sort out >actual-no-follow-sorted-output &&
+
+ test_cmp expected-no-follow-sorted-output actual-no-follow-sorted-output
+'
+
+test_expect_success SYMLINKS 'dir-iterator should follow symlinks w/ follow flag' '
+ cat >expected-follow-sorted-output <<-EOF &&
+ [d] (a) [a] ./dir4/a
+ [d] (a/f) [f] ./dir4/a/f
+ [d] (a/f/c) [c] ./dir4/a/f/c
+ [d] (b) [b] ./dir4/b
+ [d] (b/c) [c] ./dir4/b/c
+ [f] (a/d) [d] ./dir4/a/d
+ [f] (a/e) [e] ./dir4/a/e
+ EOF
+
+ test-tool dir-iterator --follow-symlinks ./dir4 >out &&
+ sort out >actual-follow-sorted-output &&
+
+ test_cmp expected-follow-sorted-output actual-follow-sorted-output
+'
+
+test_done
'
test_expect_success PERL 'commit -p with shrinking cache-tree' '
- mkdir -p deep/subdir &&
- echo content >deep/subdir/file &&
+ mkdir -p deep/very-long-subdir &&
+ echo content >deep/very-long-subdir/file &&
git add deep &&
git commit -m add &&
git rm -r deep &&
test_description='Gettext Shell poison'
-GIT_TEST_GETTEXT_POISON=YesPlease
+GIT_TEST_GETTEXT_POISON=true
export GIT_TEST_GETTEXT_POISON
. ./lib-gettext.sh
test_cmp expect actual
'
+test_expect_success "gettext: invalid GIT_TEST_GETTEXT_POISON value doesn't infinitely loop" "
+ test_must_fail env GIT_TEST_GETTEXT_POISON=xyz git version 2>error &&
+ grep \"fatal: bad numeric config value 'xyz' for 'GIT_TEST_GETTEXT_POISON': invalid unit\" error
+"
+
test_done
test_expect_success 'extensions.partialclone without filter' '
test_create_repo server &&
git clone --filter="blob:none" "file://$(pwd)/server" client &&
- git -C client config --unset core.partialclonefilter &&
+ git -C client config --unset remote.origin.partialclonefilter &&
git -C client fetch origin
'
# associated packfile contains the object
ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
test_line_count = 1 promisorlist &&
- IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
- git verify-pack --verbose "$IDX" | grep "$HASH"
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH" out
'
test_expect_success 'fetching of missing objects works with ref-in-want enabled' '
grep "git< fetch=.*ref-in-want" trace
'
+test_expect_success 'fetching of missing objects from another promisor remote' '
+ git clone "file://$(pwd)/server" server2 &&
+ test_commit -C server2 bar &&
+ git -C server2 repack -a -d --write-bitmap-index &&
+ HASH2=$(git -C server2 rev-parse bar) &&
+
+ git -C repo remote add server2 "file://$(pwd)/server2" &&
+ git -C repo config remote.server2.promisor true &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ git -C repo fetch server2 &&
+ rm -rf repo/.git/objects/* &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ # Ensure that the .promisor file is written, and check that its
+ # associated packfile contains the object
+ ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+ test_line_count = 1 promisorlist &&
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH2" out
+'
+
+test_expect_success 'fetching of missing objects configures a promisor remote' '
+ git clone "file://$(pwd)/server" server3 &&
+ test_commit -C server3 baz &&
+ git -C server3 repack -a -d --write-bitmap-index &&
+ HASH3=$(git -C server3 rev-parse baz) &&
+ git -C server3 config uploadpack.allowfilter 1 &&
+
+ rm repo/.git/objects/pack/pack-*.promisor &&
+
+ git -C repo remote add server3 "file://$(pwd)/server3" &&
+ git -C repo fetch --filter="blob:none" server3 $HASH3 &&
+
+ test_cmp_config -C repo true remote.server3.promisor &&
+
+ # Ensure that the .promisor file is written, and check that its
+ # associated packfile contains the object
+ ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+ test_line_count = 1 promisorlist &&
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH3" out
+'
+
test_expect_success 'fetching of missing blobs works' '
- rm -rf server repo &&
+ rm -rf server server2 repo &&
+ rm -rf server server3 repo &&
test_create_repo server &&
test_commit -C server foo &&
git -C server repack -a -d --write-bitmap-index &&
git -C repo config core.repositoryformatversion 1 &&
git -C repo config extensions.partialclone "arbitrary string" &&
- GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
+ GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
grep $(git -C repo rev-parse bar) out &&
! grep $FOO out
'
# associated packfile contains the object
ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
test_line_count = 1 promisorlist &&
- IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
- git verify-pack --verbose "$IDX" | grep "$HASH"
+ IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+ git verify-pack --verbose "$IDX" >out &&
+ grep "$HASH" out
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
}
test_blob_does_not_exist() {
- test_expect_success SHA1 'blob does not exist in database' "
+ test_expect_success 'blob does not exist in database' "
test_must_fail git cat-file blob $1
"
}
test_blob_exists() {
- test_expect_success SHA1 'blob exists in database' "
+ test_expect_success 'blob exists in database' "
git cat-file blob $1
"
}
hello_content="Hello World"
-hello_sha1=5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-
example_content="This is an example"
-example_sha1=ddd3f836d3e3fbb7ae289aa9ae83536f76956399
setup_repo() {
echo_without_newline "$hello_content" > hello
rm -rf $test_repo
}
-setup_repo
+test_expect_success 'setup' '
+ setup_repo &&
+ test_oid_cache <<-EOF
+ hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+ hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
+
+ example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+ example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+ EOF
+'
# Argument checking
push_repo
-test_expect_success SHA1 'hash a file' '
- test $hello_sha1 = $(git hash-object hello)
+test_expect_success 'hash a file' '
+ test "$(test_oid hello)" = $(git hash-object hello)
'
-test_blob_does_not_exist $hello_sha1
+test_blob_does_not_exist "$(test_oid hello)"
-test_expect_success SHA1 'hash from stdin' '
- test $example_sha1 = $(git hash-object --stdin < example)
+test_expect_success 'hash from stdin' '
+ test "$(test_oid example)" = $(git hash-object --stdin < example)
'
-test_blob_does_not_exist $example_sha1
+test_blob_does_not_exist "$(test_oid example)"
-test_expect_success SHA1 'hash a file and write to database' '
- test $hello_sha1 = $(git hash-object -w hello)
+test_expect_success 'hash a file and write to database' '
+ test "$(test_oid hello)" = $(git hash-object -w hello)
'
-test_blob_exists $hello_sha1
+test_blob_exists "$(test_oid hello)"
test_expect_success 'git hash-object --stdin file1 <file0 first operates on file0, then file1' '
echo foo > file1 &&
for args in "-w --stdin" "--stdin -w"; do
push_repo
- test_expect_success SHA1 "hash from stdin and write to database ($args)" '
- test $example_sha1 = $(git hash-object $args < example)
+ test_expect_success "hash from stdin and write to database ($args)" '
+ test "$(test_oid example)" = $(git hash-object $args < example)
'
- test_blob_exists $example_sha1
+ test_blob_exists "$(test_oid example)"
pop_repo
done
filenames="hello
example"
-sha1s="$hello_sha1
-$example_sha1"
+oids="$(test_oid hello)
+$(test_oid example)"
-test_expect_success SHA1 "hash two files with names on stdin" '
- test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
+test_expect_success "hash two files with names on stdin" '
+ test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
'
for args in "-w --stdin-paths" "--stdin-paths -w"; do
push_repo
- test_expect_success SHA1 "hash two files with names on stdin and write to database ($args)" '
- test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+ test_expect_success "hash two files with names on stdin and write to database ($args)" '
+ test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
'
- test_blob_exists $hello_sha1
- test_blob_exists $example_sha1
+ test_blob_exists "$(test_oid hello)"
+ test_blob_exists "$(test_oid example)"
pop_repo
done
test_path_is_file c
'
-test_expect_success 'checkout -b checkout.optimizeNewBranch interaction' '
- cp .git/info/sparse-checkout .git/info/sparse-checkout.bak &&
- test_when_finished "
- mv -f .git/info/sparse-checkout.bak .git/info/sparse-checkout
- git checkout master
- " &&
- echo "/b" >>.git/info/sparse-checkout &&
- test "$(git ls-files -t b)" = "S b" &&
- git -c checkout.optimizeNewBranch=true checkout -b fast &&
- test "$(git ls-files -t b)" = "S b" &&
- git checkout -b slow &&
- test "$(git ls-files -t b)" = "H b"
-'
-
test_expect_success 'merge feature branch into sparse checkout of master' '
git merge feature &&
test_path_is_file a &&
)
'
+test_expect_success 'conditional include, onbranch' '
+ echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
+ echo "[test]nine=9" >.git/bar9 &&
+ git checkout -b master &&
+ test_must_fail git config test.nine &&
+ git checkout -b foo-branch &&
+ echo 9 >expect &&
+ git config test.nine >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'conditional include, onbranch, wildcard' '
+ echo "[includeIf \"onbranch:?oo-*/**\"]path=bar10" >>.git/config &&
+ echo "[test]ten=10" >.git/bar10 &&
+ git checkout -b not-foo-branch/a &&
+ test_must_fail git config test.ten &&
+
+ echo 10 >expect &&
+ git checkout -b foo-branch/a/b/c &&
+ git config test.ten >actual &&
+ test_cmp expect actual &&
+
+ git checkout -b moo-bar/a &&
+ git config test.ten >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'conditional include, onbranch, implicit /** for /' '
+ echo "[includeIf \"onbranch:foo-dir/\"]path=bar11" >>.git/config &&
+ echo "[test]eleven=11" >.git/bar11 &&
+ git checkout -b not-foo-dir/a &&
+ test_must_fail git config test.eleven &&
+
+ echo 11 >expect &&
+ git checkout -b foo-dir/a/b/c &&
+ git config test.eleven >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'include cycles are detected' '
- cat >.gitconfig <<-\EOF &&
- [test]value = gitconfig
- [include]path = cycle
- EOF
- cat >cycle <<-\EOF &&
- [test]value = cycle
- [include]path = .gitconfig
- EOF
- cat >expect <<-\EOF &&
- gitconfig
- cycle
- EOF
- test_must_fail git config --get-all test.value 2>stderr &&
- test_i18ngrep "exceeded maximum include depth" stderr
+ git init --bare cycle &&
+ git -C cycle config include.path cycle &&
+ git config -f cycle/cycle include.path config &&
+ test_must_fail \
+ env GIT_TEST_GETTEXT_POISON=false \
+ git -C cycle config --get-all test.value 2>stderr &&
+ grep "exceeded maximum include depth" stderr
'
test_done
test_with_config "["
'
+test_expect_success 'early config and onbranch' '
+ echo "[broken" >broken &&
+ test_with_config "[includeif \"onbranch:master\"]path=../broken"
+'
+
+test_expect_success 'onbranch config outside of git repo' '
+ test_config_global includeIf.onbranch:master.path non-existent &&
+ nongit git help
+'
+
test_done
}
corrupt () {
- aa=${1%??????????????????????????????????????} zz=${1#??}
- mv .git/objects/$aa/$zz .git/$aa$zz
+ mv .git/objects/$(test_oid_to_path $1) .git/$1
}
recover () {
- aa=${1%??????????????????????????????????????} zz=${1#??}
+ aa=$(echo $1 | cut -c 1-2)
mkdir -p .git/objects/$aa
- mv .git/$aa$zz .git/objects/$aa/$zz
+ mv .git/$1 .git/objects/$(test_oid_to_path $1)
}
check_dont_have () {
}
test_expect_success setup '
+ test_oid_init &&
mkdir -p A/B &&
echo rat >C &&
echo ox >A/D &&
# Each line is 114 characters, so we need 75 to still have a few before the
# last 8K. The 89-character padding on the final entry lines up our
# newline exactly.
-test_expect_success 'parsing reverse reflogs at BUFSIZ boundaries' '
+test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
git checkout -b reflogskip &&
- z38=00000000000000000000000000000000000000 &&
+ zf=$(test_oid zero_2) &&
ident="abc <xyz> 0000000001 +0000" &&
for i in $(test_seq 1 75); do
- printf "$z38%02d $z38%02d %s\t" $i $(($i+1)) "$ident" &&
+ printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
if test $i = 75; then
for j in $(test_seq 1 89); do
printf X
printf "\n"
done >.git/logs/refs/heads/reflogskip &&
git rev-parse reflogskip@{73} >actual &&
- echo ${z38}03 >expect &&
+ echo ${zf}03 >expect &&
test_cmp expect actual
'
. ./test-lib.sh
test_expect_success setup '
+ test_oid_init &&
git config gc.auto 0 &&
git config i18n.commitencoding ISO-8859-1 &&
test_commit A fileA one &&
test_expect_success 'object with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(echo $sha | sed "s+^..+&/+") &&
- new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
+ old=$(test_oid_to_path "$sha") &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
sha="$(dirname $new)$(basename $new)" &&
mv .git/objects/$old .git/objects/$new &&
test_when_finished "remove_object $sha" &&
test_expect_success 'HEAD link pointing at a funny object' '
test_when_finished "mv .git/SAVED_HEAD .git/HEAD" &&
mv .git/HEAD .git/SAVED_HEAD &&
- echo 0000000000000000000000000000000000000000 >.git/HEAD &&
+ echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail env GIT_DIR=.git git fsck 2>out &&
cat out &&
'
test_expect_success 'unparseable tree object' '
+ test_oid_cache <<-\EOF &&
+ junk sha1:twenty-bytes-of-junk
+ junk sha256:twenty-bytes-of-junk-twelve-more
+ EOF
+
test_when_finished "git update-ref -d refs/heads/wrong" &&
test_when_finished "remove_object \$tree_sha1" &&
test_when_finished "remove_object \$commit_sha1" &&
- tree_sha1=$(printf "100644 \0twenty-bytes-of-junk" | git hash-object -t tree --stdin -w --literally) &&
+ junk=$(test_oid junk) &&
+ tree_sha1=$(printf "100644 \0$junk" | git hash-object -t tree --stdin -w --literally) &&
commit_sha1=$(git commit-tree $tree_sha1) &&
git update-ref refs/heads/wrong $commit_sha1 &&
test_must_fail git fsck 2>out &&
'
test_expect_success 'tag pointing to nonexistent' '
- cat >invalid-tag <<-\EOF &&
- object ffffffffffffffffffffffffffffffffffffffff
+ badoid=$(test_oid deadbeef) &&
+ cat >invalid-tag <<-EOF &&
+ object $badoid
type commit
tag invalid
tagger T A Gger <tagger@example.com> 1234567890 -0000
test_expect_success 'rev-list --verify-objects with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
- old=$(echo $sha | sed "s+^..+&/+") &&
- new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
+ old=$(test_oid_to_path $sha) &&
+ new=$(dirname $old)/$(test_oid ff_2) &&
sha="$(dirname $new)$(basename $new)" &&
mv .git/objects/$old .git/objects/$new &&
test_when_finished "remove_object $sha" &&
test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out &&
cat out &&
- test_i18ngrep -q "error: hash mismatch 63ffffffffffffffffffffffffffffffffffffff" out
+ test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out
'
test_expect_success 'force fsck to ignore double author' '
'
_bz='\0'
-_bz5="$_bz$_bz$_bz$_bz$_bz"
-_bz20="$_bz5$_bz5$_bz5$_bz5"
+_bzoid=$(printf $ZERO_OID | sed -e 's/00/\\0/g')
test_expect_success 'fsck notices blob entry pointing to null sha1' '
(git init null-blob &&
cd null-blob &&
- sha=$(printf "100644 file$_bz$_bz20" |
+ sha=$(printf "100644 file$_bz$_bzoid" |
git hash-object -w --stdin -t tree) &&
git fsck 2>out &&
cat out &&
test_expect_success 'fsck notices submodule entry pointing to null sha1' '
(git init null-commit &&
cd null-commit &&
- sha=$(printf "160000 submodule$_bz$_bz20" |
+ sha=$(printf "160000 submodule$_bz$_bzoid" |
git hash-object -w --stdin -t tree) &&
git fsck 2>out &&
cat out &&
# its type. That lets us see that --connectivity-only is
# not actually looking at the contents, but leaves it
# free to examine the type if it chooses.
- empty=.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 &&
+ empty=.git/objects/$(test_oid_to_path $EMPTY_BLOB) &&
blob=$(echo unrelated | git hash-object -w --stdin) &&
mv -f $(sha1_file $blob) $empty &&
test_expect_success 'alternate objects are correctly blamed' '
test_when_finished "rm -rf alt.git .git/objects/info/alternates" &&
+ name=$(test_oid numeric) &&
+ path=$(test_oid_to_path "$name") &&
git init --bare alt.git &&
echo "../../alt.git/objects" >.git/objects/info/alternates &&
- mkdir alt.git/objects/12 &&
- >alt.git/objects/12/34567890123456789012345678901234567890 &&
+ mkdir alt.git/objects/$(dirname $path) &&
+ >alt.git/objects/$(dirname $path)/$(basename $path) &&
test_must_fail git fsck >out 2>&1 &&
test_i18ngrep alt.git out
'
)
'
-test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
+test_index_version () {
+ INDEX_VERSION_CONFIG=$1 &&
+ FEATURE_MANY_FILES=$2 &&
+ ENV_VAR_VERSION=$3
+ EXPECTED_OUTPUT_VERSION=$4 &&
(
rm -f .git/index &&
- GIT_INDEX_VERSION=4 &&
- export GIT_INDEX_VERSION &&
- git config --add index.version 2 &&
+ rm -f .git/config &&
+ if test "$INDEX_VERSION_CONFIG" -ne 0
+ then
+ git config --add index.version $INDEX_VERSION_CONFIG
+ fi &&
+ git config --add feature.manyFiles $FEATURE_MANY_FILES
+ if test "$ENV_VAR_VERSION" -ne 0
+ then
+ GIT_INDEX_VERSION=$ENV_VAR_VERSION &&
+ export GIT_INDEX_VERSION
+ else
+ unset GIT_INDEX_VERSION
+ fi &&
git add a 2>&1 &&
- echo 4 >expect &&
+ echo $EXPECTED_OUTPUT_VERSION >expect &&
test-tool index-version <.git/index >actual &&
test_cmp expect actual
)
+}
+
+test_expect_success 'index version config precedence' '
+ test_index_version 2 false 4 4 &&
+ test_index_version 2 true 0 2 &&
+ test_index_version 0 true 0 4 &&
+ test_index_version 0 true 2 2
'
test_done
test-tool chmtime =-5 "$1"
}
+test_expect_success 'setup' '
+ test_oid_cache <<-EOF
+ own_v3 sha1:8299b0bcd1ac364e5f1d7768efb62fa2da79a339
+ own_v3 sha256:38a6d2925e3eceec33ad7b34cbff4e0086caa0daf28f31e51f5bd94b4a7af86b
+
+ base_v3 sha1:39d890139ee5356c7ef572216cebcd27aa41f9df
+ base_v3 sha256:c9baeadf905112bf6c17aefbd7d02267afd70ded613c30cafed2d40cb506e1ed
+
+ own_v4 sha1:432ef4b63f32193984f339431fd50ca796493569
+ own_v4 sha256:6738ac6319c25b694afa7bcc313deb182d1a59b68bf7a47b4296de83478c0420
+
+ base_v4 sha1:508851a7f0dfa8691e9f69c7f055865389012491
+ base_v4 sha256:3177d4adfdd4b6904f7e921d91d715a471c0dde7cf6a4bba574927f02b699508
+ EOF
+'
+
test_expect_success 'enable split index' '
git config splitIndex.maxPercentChange 100 &&
git update-index --split-index &&
# NEEDSWORK: Stop hard-coding checksums.
if test "$indexversion" = "4"
then
- own=432ef4b63f32193984f339431fd50ca796493569
- base=508851a7f0dfa8691e9f69c7f055865389012491
+ own=$(test_oid own_v4)
+ base=$(test_oid base_v4)
else
- own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
- base=39d890139ee5356c7ef572216cebcd27aa41f9df
+ own=$(test_oid own_v3)
+ base=$(test_oid base_v3)
fi &&
cat >expect <<-EOF &&
test_expect_success 'modify original file, base index untouched' '
echo modified | create_non_racy_file one &&
+ file1_blob=$(git hash-object one) &&
git update-index one &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
replacements: 0
deletions:
EOF
git update-index --add two &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
100644 $EMPTY_BLOB 0 two
replacements: 0
deletions:
git update-index --force-remove two &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0 one
+ 100644 $file1_blob 0 one
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
q_to_tab >expect <<-EOF &&
$BASE
- 100644 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0Q
+ 100644 $file1_blob 0Q
replacements: 0
deletions:
EOF
git update-index --add three &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 three
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 two
+ 100644 $EMPTY_BLOB 0 one
+ 100644 $EMPTY_BLOB 0 three
+ 100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
git update-index --force-remove three &&
git ls-files --stage >ls-files.actual &&
cat >ls-files.expect <<-EOF &&
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 two
+ 100644 $EMPTY_BLOB 0 one
+ 100644 $EMPTY_BLOB 0 two
EOF
test_cmp ls-files.expect ls-files.actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&
$BASE
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 four
+ 100644 $EMPTY_BLOB 0 four
replacements:
deletions:
EOF
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&
$BASE
- 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 six
+ 100644 $EMPTY_BLOB 0 six
replacements:
deletions:
EOF
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
- Note: checking out 'HEAD^'.
+ Note: switching to 'HEAD^'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
- state without impacting any branches by performing another checkout.
+ state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
- do so (now or later) by using -b with the checkout command again. Example:
+ do so (now or later) by using -c with the switch command. Example:
- git checkout -b <new-branch-name>
+ git switch -c <new-branch-name>
+
+ Or undo this operation with:
+
+ git switch -
+
+ Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at \$commit three
EOF
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
- Note: checking out 'HEAD^'.
+ Note: switching to 'HEAD^'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
- state without impacting any branches by performing another checkout.
+ state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
- do so (now or later) by using -b with the checkout command again. Example:
+ do so (now or later) by using -c with the switch command. Example:
+
+ git switch -c <new-branch-name>
+
+ Or undo this operation with:
+
+ git switch -
- git checkout -b <new-branch-name>
+ Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at \$commit... three
EOF
test_cmp expect actual
'
+test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' '
+ echo "nonempty" >nonempty &&
+ >empty &&
+ git add nonempty empty &&
+ git commit -m "create files to be deleted" &&
+ git rm --cached nonempty empty &&
+ git add -N nonempty empty &&
+ git checkout HEAD nonempty empty &&
+ git diff --cached --exit-code
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='switch basic functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit first &&
+ git branch first-branch &&
+ test_commit second &&
+ test_commit third &&
+ git remote add origin nohost:/nopath &&
+ git update-ref refs/remotes/origin/foo first-branch
+'
+
+test_expect_success 'switch branch no arguments' '
+ test_must_fail git switch
+'
+
+test_expect_success 'switch branch' '
+ git switch first-branch &&
+ test_path_is_missing second.t
+'
+
+test_expect_success 'switch and detach' '
+ test_when_finished git switch master &&
+ test_must_fail git switch master^{commit} &&
+ git switch --detach master^{commit} &&
+ test_must_fail git symbolic-ref HEAD
+'
+
+test_expect_success 'switch and detach current branch' '
+ test_when_finished git switch master &&
+ git switch master &&
+ git switch --detach &&
+ test_must_fail git symbolic-ref HEAD
+'
+
+test_expect_success 'switch and create branch' '
+ test_when_finished git switch master &&
+ git switch -c temp master^ &&
+ test_cmp_rev master^ refs/heads/temp &&
+ echo refs/heads/temp >expected-branch &&
+ git symbolic-ref HEAD >actual-branch &&
+ test_cmp expected-branch actual-branch
+'
+
+test_expect_success 'force create branch from HEAD' '
+ test_when_finished git switch master &&
+ git switch --detach master &&
+ test_must_fail git switch -c temp &&
+ git switch -C temp &&
+ test_cmp_rev master refs/heads/temp &&
+ echo refs/heads/temp >expected-branch &&
+ git symbolic-ref HEAD >actual-branch &&
+ test_cmp expected-branch actual-branch
+'
+
+test_expect_success 'new orphan branch from empty' '
+ test_when_finished git switch master &&
+ test_must_fail git switch --orphan new-orphan HEAD &&
+ git switch --orphan new-orphan &&
+ test_commit orphan &&
+ git cat-file commit refs/heads/new-orphan >commit &&
+ ! grep ^parent commit &&
+ git ls-files >tracked-files &&
+ echo orphan.t >expected &&
+ test_cmp expected tracked-files
+'
+
+test_expect_success 'switching ignores file of same branch name' '
+ test_when_finished git switch master &&
+ : >first-branch &&
+ git switch first-branch &&
+ echo refs/heads/first-branch >expected &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'guess and create branch ' '
+ test_when_finished git switch master &&
+ test_must_fail git switch --no-guess foo &&
+ git switch foo &&
+ echo refs/heads/foo >expected &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'not switching when something is in progress' '
+ test_when_finished rm -f .git/MERGE_HEAD &&
+ # fake a merge-in-progress
+ cp .git/HEAD .git/MERGE_HEAD &&
+ test_must_fail git switch -d @^
+'
+
+test_done
--- /dev/null
+#!/bin/sh
+
+test_description='restore basic functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit first &&
+ echo first-and-a-half >>first.t &&
+ git add first.t &&
+ test_commit second &&
+ echo one >one &&
+ echo two >two &&
+ echo untracked >untracked &&
+ echo ignored >ignored &&
+ echo /ignored >.gitignore &&
+ git add one two .gitignore &&
+ git update-ref refs/heads/one master
+'
+
+test_expect_success 'restore without pathspec is not ok' '
+ test_must_fail git restore &&
+ test_must_fail git restore --source=first
+'
+
+test_expect_success 'restore a file, ignoring branch of same name' '
+ cat one >expected &&
+ echo dirty >>one &&
+ git restore one &&
+ test_cmp expected one
+'
+
+test_expect_success 'restore a file on worktree from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first first.t &&
+ test_cmp expected first.t &&
+ git cat-file blob HEAD:./first.t >expected &&
+ git show :first.t >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'restore a file in the index from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first --staged first.t &&
+ git show :first.t >actual &&
+ test_cmp expected actual &&
+ git cat-file blob HEAD:./first.t >expected &&
+ test_cmp expected first.t
+'
+
+test_expect_success 'restore a file in both the index and worktree from another ref' '
+ test_when_finished git reset --hard &&
+ git cat-file blob first:./first.t >expected &&
+ git restore --source=first --staged --worktree first.t &&
+ git show :first.t >actual &&
+ test_cmp expected actual &&
+ test_cmp expected first.t
+'
+
+test_expect_success 'restore --staged uses HEAD as source' '
+ test_when_finished git reset --hard &&
+ git cat-file blob :./first.t >expected &&
+ echo index-dirty >>first.t &&
+ git add first.t &&
+ git restore --staged first.t &&
+ git cat-file blob :./first.t >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
+ git init unmerged &&
+ (
+ cd unmerged &&
+ echo one >unmerged &&
+ echo one >common &&
+ git add unmerged common &&
+ git commit -m common &&
+ git switch -c first &&
+ echo first >unmerged &&
+ git commit -am first &&
+ git switch -c second master &&
+ echo second >unmerged &&
+ git commit -am second &&
+ test_must_fail git merge first &&
+
+ echo dirty >>common &&
+ test_must_fail git restore . &&
+
+ git restore --ignore-unmerged --quiet . >output 2>&1 &&
+ git diff common >diff-output &&
+ test_must_be_empty output &&
+ test_must_be_empty diff-output
+ )
+'
+
+test_expect_success 'restore --staged adds deleted intent-to-add file back to index' '
+ echo "nonempty" >nonempty &&
+ >empty &&
+ git add nonempty empty &&
+ git commit -m "create files to be deleted" &&
+ git rm --cached nonempty empty &&
+ git add -N nonempty empty &&
+ git restore --staged nonempty empty &&
+ git diff --cached --exit-code
+'
+
+test_done
--- /dev/null
+#!/bin/sh
+
+test_description='git restore --patch'
+
+. ./lib-patch-mode.sh
+
+test_expect_success PERL 'setup' '
+ mkdir dir &&
+ echo parent >dir/foo &&
+ echo dummy >bar &&
+ git add bar dir/foo &&
+ git commit -m initial &&
+ test_tick &&
+ test_commit second dir/foo head &&
+ set_and_save_state bar bar_work bar_index &&
+ save_head
+'
+
+test_expect_success PERL 'restore -p without pathspec is fine' '
+ echo q >cmd &&
+ git restore -p <cmd
+'
+
+# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
+
+test_expect_success PERL 'saying "n" does nothing' '
+ set_and_save_state dir/foo work head &&
+ test_write_lines n n | git restore -p &&
+ verify_saved_state bar &&
+ verify_saved_state dir/foo
+'
+
+test_expect_success PERL 'git restore -p' '
+ set_and_save_state dir/foo work head &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'git restore -p with staged changes' '
+ set_state dir/foo work index &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo index index
+'
+
+test_expect_success PERL 'git restore -p --source=HEAD' '
+ set_state dir/foo work index &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git restore -p --source=HEAD &&
+ verify_saved_state bar &&
+ verify_state dir/foo head index
+'
+
+test_expect_success PERL 'git restore -p --source=HEAD^' '
+ set_state dir/foo work index &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git restore -p --source=HEAD^ &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent index
+'
+
+test_expect_success PERL 'git restore -p handles deletion' '
+ set_state dir/foo work index &&
+ rm dir/foo &&
+ test_write_lines n y | git restore -p &&
+ verify_saved_state bar &&
+ verify_state dir/foo index index
+'
+
+# The idea in the rest is that bar sorts first, so we always say 'y'
+# first and if the path limiter fails it'll apply to bar instead of
+# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
+# the failure case (and thus get out of the loop).
+
+test_expect_success PERL 'path limiting works: dir' '
+ set_state dir/foo work head &&
+ test_write_lines y n | git restore -p dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'path limiting works: -- dir' '
+ set_state dir/foo work head &&
+ test_write_lines y n | git restore -p -- dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
+ set_state dir/foo work head &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent head
+'
+
+test_expect_success PERL 'path limiting works: foo inside dir' '
+ set_state dir/foo work head &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines y n n | (cd dir && git restore -p foo) &&
+ verify_saved_state bar &&
+ verify_state dir/foo head head
+'
+
+test_expect_success PERL 'none of this moved HEAD' '
+ verify_saved_head
+'
+
+test_done
test_expect_success '"diff HEAD" includes ita as new files' '
git reset --hard &&
echo new >new-ita &&
+ oid=$(git hash-object new-ita) &&
+ oid=$(git rev-parse --short $oid) &&
git add -N new-ita &&
git diff HEAD >actual &&
- cat >expected <<-\EOF &&
+ cat >expected <<-EOF &&
diff --git a/new-ita b/new-ita
new file mode 100644
- index 0000000..3e75765
+ index 0000000..$oid
--- /dev/null
+++ b/new-ita
@@ -0,0 +1 @@
git worktree add --force --force --detach gnoo
'
+test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
+ git worktree add --detach ". weird*..?.lock.lock" &&
+ test -d .git/worktrees/---weird-.-
+'
+
test_expect_success '"add" should not fail because of another bad worktree' '
git init add-fail &&
(
. ./test-lib.sh
-new_line='
-'
sq=\'
test_expect_success 'prepare' '
git worktree add -f bazdir2 baz &&
git branch -M baz bam &&
test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
- test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam
+ test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+ rm -r bazdir bazdir2 &&
+ git worktree prune
'
test_expect_success 'git branch -M baz bam should succeed within a worktree in which baz is checked out' '
git checkout -b baz &&
- git worktree add -f bazdir3 baz &&
+ git worktree add -f bazdir baz &&
(
- cd bazdir3 &&
+ cd bazdir &&
git branch -M baz bam &&
test $(git rev-parse --abbrev-ref HEAD) = bam
) &&
- test $(git rev-parse --abbrev-ref HEAD) = bam
+ test $(git rev-parse --abbrev-ref HEAD) = bam &&
+ rm -r bazdir &&
+ git worktree prune
'
test_expect_success 'git branch -M master should work when master is checked out' '
test_expect_success 'deleting currently checked out branch fails' '
git worktree add -b my7 my7 &&
test_must_fail git -C my7 branch -d my7 &&
- test_must_fail git branch -d my7
+ test_must_fail git branch -d my7 &&
+ rm -r my7 &&
+ git worktree prune
'
test_expect_success 'test --track without .fetch entries' '
EOF
test_cmp expect actual &&
git branch --verbose --merged topic >actual &&
- cat >expect <<-\EOF &&
- master c77a0a9 second on master
- * topic 2c939f4 [ahead 1] foo
- zzz c77a0a9 second on master
+ cat >expect <<-EOF &&
+ master $(git rev-parse --short master) second on master
+ * topic $(git rev-parse --short topic ) [ahead 1] foo
+ zzz $(git rev-parse --short zzz ) second on master
EOF
test_i18ncmp expect actual
'
branch-two
EOF
git checkout branch-one &&
- git worktree add worktree branch-two &&
+ test_when_finished "
+ git worktree remove worktree_dir
+ " &&
+ git worktree add worktree_dir branch-two &&
{
git branch --show-current &&
- git -C worktree branch --show-current
+ git -C worktree_dir branch --show-current
} >actual &&
test_cmp expect actual
'
test_i18ncmp expect actual
'
+test_expect_success 'worktree colors correct' '
+ cat >expect <<-EOF &&
+ * <GREEN>(HEAD detached from fromtag)<RESET>
+ ambiguous<RESET>
+ branch-one<RESET>
+ + <CYAN>branch-two<RESET>
+ master<RESET>
+ ref-to-branch<RESET> -> branch-one
+ ref-to-remote<RESET> -> origin/branch-one
+ EOF
+ git worktree add worktree_dir branch-two &&
+ git branch --color >actual.raw &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_decode_color <actual.raw >actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success "set up color tests" '
echo "<RED>master<RESET>" >expect.color &&
echo "master" >expect.bare &&
test_cmp expect.color actual
'
+test_expect_success 'verbose output lists worktree path' '
+ one=$(git rev-parse --short HEAD) &&
+ two=$(git rev-parse --short master) &&
+ cat >expect <<-EOF &&
+ * (HEAD detached from fromtag) $one one
+ ambiguous $one one
+ branch-one $two two
+ + branch-two $one ($(pwd)/worktree_dir) one
+ master $two two
+ ref-to-branch $two two
+ ref-to-remote $two two
+ EOF
+ git worktree add worktree_dir branch-two &&
+ git branch -vv >actual &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_i18ncmp expect actual
+'
+
test_done
# harm than good. We need some real history.
test_expect_success 'setup' '
- git fast-import < "$TEST_DIRECTORY"/t3206/history.export
+ git fast-import < "$TEST_DIRECTORY"/t3206/history.export &&
+ test_oid_cache <<-EOF
+ # topic
+ t1 sha1:4de457d
+ t2 sha1:fccce22
+ t3 sha1:147e64e
+ t4 sha1:a63e992
+ t1 sha256:b89f8b9
+ t2 sha256:5f12aad
+ t3 sha256:ea8b273
+ t4 sha256:14b7336
+
+ # unmodified
+ u1 sha1:35b9b25
+ u2 sha1:de345ab
+ u3 sha1:9af6654
+ u4 sha1:2901f77
+ u1 sha256:e3731be
+ u2 sha256:14fadf8
+ u3 sha256:736c4bc
+ u4 sha256:673e77d
+
+ # reordered
+ r1 sha1:aca177a
+ r2 sha1:14ad629
+ r3 sha1:ee58208
+ r4 sha1:307b27a
+ r1 sha256:f59d3aa
+ r2 sha256:fb261a8
+ r3 sha256:cb2649b
+ r4 sha256:958577e
+
+ # removed (deleted)
+ d1 sha1:7657159
+ d2 sha1:43d84d3
+ d3 sha1:a740396
+ d1 sha256:e312513
+ d2 sha256:eb19258
+ d3 sha256:1ccb3c1
+
+ # added
+ a1 sha1:2716022
+ a2 sha1:b62accd
+ a3 sha1:df46cfa
+ a4 sha1:3e64548
+ a5 sha1:12b4063
+ a1 sha256:d724f4d
+ a2 sha256:1de7762
+ a3 sha256:e159431
+ a4 sha256:b3e483c
+ a5 sha256:90866a7
+
+ # rebased
+ b1 sha1:cc9c443
+ b2 sha1:c5d9641
+ b3 sha1:28cc2b6
+ b4 sha1:5628ab7
+ b5 sha1:a31b12e
+ b1 sha256:a1a8717
+ b2 sha256:20a5862
+ b3 sha256:587172a
+ b4 sha256:2721c5d
+ b5 sha256:7b57864
+
+ # changed
+ c1 sha1:a4b3333
+ c2 sha1:f51d370
+ c3 sha1:0559556
+ c4 sha1:d966c5c
+ c1 sha256:f8c2b9d
+ c2 sha256:3fb6318
+ c3 sha256:168ab68
+ c4 sha256:3526539
+
+ # changed-message
+ m1 sha1:f686024
+ m2 sha1:4ab067d
+ m3 sha1:b9cb956
+ m4 sha1:8add5f1
+ m1 sha256:31e6281
+ m2 sha256:a06bf1b
+ m3 sha256:82dc654
+ m4 sha256:48470c5
+
+ # renamed
+ n1 sha1:f258d75
+ n2 sha1:017b62d
+ n3 sha1:3ce7af6
+ n4 sha1:1e6226b
+ n1 sha256:ad52114
+ n2 sha256:3b54c8f
+ n3 sha256:3b0a644
+ n4 sha256:e461653
+
+ # added and removed
+ s1 sha1:096b1ba
+ s2 sha1:d92e698
+ s3 sha1:9a1db4d
+ s4 sha1:fea3b5c
+ s1 sha256:a7f9134
+ s2 sha256:b4c2580
+ s3 sha256:1d62aa2
+ s4 sha256:48160e8
+
+ # Empty delimiter (included so lines match neatly)
+ __ sha1:-------
+ __ sha256:-------
+ EOF
'
test_expect_success 'simple A..B A..C (unmodified)' '
git range-diff --no-color master..topic master..unmodified \
>actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 35b9b25 s/5/A/
- 2: fccce22 = 2: de345ab s/4/A/
- 3: 147e64e = 3: 9af6654 s/11/B/
- 4: a63e992 = 4: 2901f77 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
+ 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'trivial reordering' '
git range-diff --no-color master topic reordered >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: aca177a s/5/A/
- 3: 147e64e = 2: 14ad629 s/11/B/
- 4: a63e992 = 3: ee58208 s/12/B/
- 2: fccce22 = 4: 307b27a s/4/A/
+ 1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/
+ 3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/
+ 4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/
+ 2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/
EOF
test_cmp expected actual
'
test_expect_success 'removed a commit' '
git range-diff --no-color master topic removed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 7657159 s/5/A/
- 2: fccce22 < -: ------- s/4/A/
- 3: 147e64e = 2: 43d84d3 s/11/B/
- 4: a63e992 = 3: a740396 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/
+ 2: $(test_oid t2) < -: $(test_oid __) s/4/A/
+ 3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/
+ 4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'added a commit' '
git range-diff --no-color master topic added >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: 2716022 s/5/A/
- 2: fccce22 = 2: b62accd s/4/A/
- -: ------- > 3: df46cfa s/6/A/
- 3: 147e64e = 4: 3e64548 s/11/B/
- 4: a63e992 = 5: 12b4063 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/
+ -: $(test_oid __) > 3: $(test_oid a3) s/6/A/
+ 3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/
+ 4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'new base, A B C' '
git range-diff --no-color master topic rebased >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: cc9c443 s/5/A/
- 2: fccce22 = 2: c5d9641 s/4/A/
- 3: 147e64e = 3: 28cc2b6 s/11/B/
- 4: a63e992 = 4: 5628ab7 s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/
+ 3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/
EOF
test_cmp expected actual
'
# this syntax includes the commits from master!
git range-diff --no-color topic...rebased >actual &&
cat >expected <<-EOF &&
- -: ------- > 1: a31b12e unrelated
- 1: 4de457d = 2: cc9c443 s/5/A/
- 2: fccce22 = 3: c5d9641 s/4/A/
- 3: 147e64e = 4: 28cc2b6 s/11/B/
- 4: a63e992 = 5: 5628ab7 s/12/B/
+ -: $(test_oid __) > 1: $(test_oid b5) unrelated
+ 1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/
+ 2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/
+ 3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/
+ 4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'changed commit' '
git range-diff --no-color topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- @@ -10,7 +10,7 @@
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ @@ file: A
9
10
-11
12
13
14
- 4: a63e992 ! 4: d966c5c s/12/B/
- @@ -8,7 +8,7 @@
- @@
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
+ @@ file
+ @@ file: A
9
10
- B
test_expect_success 'changed commit with --no-patch diff option' '
git range-diff --no-color --no-patch topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- 4: a63e992 ! 4: d966c5c s/12/B/
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'changed commit with --stat diff option' '
git range-diff --no-color --stat topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 2: fccce22 = 2: f51d370 s/4/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 3: 147e64e ! 3: 0559556 s/11/B/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
- 4: a63e992 ! 4: d966c5c s/12/B/
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
EOF
test_expect_success 'changed commit with sm config' '
git range-diff --no-color --submodule=log topic...changed >actual &&
cat >expected <<-EOF &&
- 1: 4de457d = 1: a4b3333 s/5/A/
- 2: fccce22 = 2: f51d370 s/4/A/
- 3: 147e64e ! 3: 0559556 s/11/B/
- @@ -10,7 +10,7 @@
+ 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
+ 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
+ 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
+ @@ file: A
9
10
-11
12
13
14
- 4: a63e992 ! 4: d966c5c s/12/B/
- @@ -8,7 +8,7 @@
- @@
+ 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
+ @@ file
+ @@ file: A
9
10
- B
test_cmp expected actual
'
+test_expect_success 'renamed file' '
+ git range-diff --no-color --submodule=log topic...renamed-file >actual &&
+ sed s/Z/\ /g >expected <<-EOF &&
+ 1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/4/A/
+ + s/4/A/ + rename file
+ Z
+ - ## file ##
+ + ## file => renamed-file ##
+ Z@@
+ Z 1
+ Z 2
+ 3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/
+ @@ Metadata
+ Z ## Commit message ##
+ Z s/11/B/
+ Z
+ - ## file ##
+ -@@ file: A
+ + ## renamed-file ##
+ +@@ renamed-file: A
+ Z 8
+ Z 9
+ Z 10
+ 4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/
+ @@ Metadata
+ Z ## Commit message ##
+ Z s/12/B/
+ Z
+ - ## file ##
+ -@@ file: A
+ + ## renamed-file ##
+ +@@ renamed-file: A
+ Z 9
+ Z 10
+ Z B
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'file added and later removed' '
+ git range-diff --no-color --submodule=log topic...added-removed >actual &&
+ sed s/Z/\ /g >expected <<-EOF &&
+ 1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/4/A/
+ + s/4/A/ + new-file
+ Z
+ Z ## file ##
+ Z@@
+ @@ file
+ Z A
+ Z 6
+ Z 7
+ +
+ + ## new-file (new) ##
+ 3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/
+ @@ Metadata
+ ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+ Z
+ Z ## Commit message ##
+ - s/11/B/
+ + s/11/B/ + remove file
+ Z
+ Z ## file ##
+ Z@@ file: A
+ @@ file: A
+ Z 12
+ Z 13
+ Z 14
+ +
+ + ## new-file (deleted) ##
+ 4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/
+ EOF
+ test_cmp expected actual
+'
+
test_expect_success 'no commits on one side' '
git commit --amend -m "new message" &&
git range-diff master HEAD@{1} HEAD
test_expect_success 'changed message' '
git range-diff --no-color topic...changed-message >actual &&
sed s/Z/\ /g >expected <<-EOF &&
- 1: 4de457d = 1: f686024 s/5/A/
- 2: fccce22 ! 2: 4ab067d s/4/A/
- @@ -2,6 +2,8 @@
- Z
+ 1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/
+ 2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/
+ @@ Metadata
+ Z ## Commit message ##
Z s/4/A/
Z
+ Also a silly comment here!
+
- Z diff --git a/file b/file
- Z --- a/file
- Z +++ b/file
- 3: 147e64e = 3: b9cb956 s/11/B/
- 4: a63e992 = 4: 8add5f1 s/12/B/
+ Z ## file ##
+ Z@@
+ Z 1
+ 3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/
+ 4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/
EOF
test_cmp expected actual
'
test_expect_success 'dual-coloring' '
- sed -e "s|^:||" >expect <<-\EOF &&
- :<YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET>
- :<RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET>
- : <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
- : <RESET>
+ sed -e "s|^:||" >expect <<-EOF &&
+ :<YELLOW>1: $(test_oid c1) = 1: $(test_oid m1) s/5/A/<RESET>
+ :<RED>2: $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2: $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
+ : ## Commit message ##<RESET>
: s/4/A/<RESET>
: <RESET>
: <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>
: <REVERSE><GREEN>+<RESET>
- : diff --git a/file b/file<RESET>
- : --- a/file<RESET>
- : +++ b/file<RESET>
- :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET>
- : <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
+ : ## file ##<RESET>
+ : <CYAN> @@<RESET>
+ : 1<RESET>
+ :<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
: 9<RESET>
: 10<RESET>
: <RED> -11<RESET>
: 12<RESET>
: 13<RESET>
: 14<RESET>
- :<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET>
- : <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
- : <CYAN> @@<RESET>
+ :<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
+ : <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
+ : <CYAN> @@ file: A<RESET>
: 9<RESET>
: 10<RESET>
: <REVERSE><RED>-<RESET><FAINT> BB<RESET>
19
20
-reset refs/heads/removed
-commit refs/heads/removed
+reset refs/heads/renamed-file
+commit refs/heads/renamed-file
mark :2
author Thomas Rast <trast@inf.ethz.ch> 1374424921 +0200
committer Thomas Rast <trast@inf.ethz.ch> 1374484724 +0200
from :46
M 100644 :28 file
-reset refs/heads/removed
-from :47
+commit refs/heads/added-removed
+mark :48
+author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574151 +0100
+data 7
+s/5/A/
+from :2
+M 100644 :3 file
+
+blob
+mark :49
+data 0
+
+commit refs/heads/added-removed
+mark :50
+author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 18
+s/4/A/ + new-file
+from :48
+M 100644 :5 file
+M 100644 :49 new-file
+
+commit refs/heads/added-removed
+mark :51
+author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 22
+s/11/B/ + remove file
+from :50
+M 100644 :7 file
+D new-file
+
+commit refs/heads/added-removed
+mark :52
+author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574177 +0100
+data 8
+s/12/B/
+from :51
+M 100644 :9 file
+
+commit refs/heads/renamed-file
+mark :53
+author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574309 +0100
+data 7
+s/5/A/
+from :2
+M 100644 :3 file
+
+commit refs/heads/renamed-file
+mark :54
+author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574312 +0100
+data 21
+s/4/A/ + rename file
+from :53
+D file
+M 100644 :5 renamed-file
+
+commit refs/heads/renamed-file
+mark :55
+author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
+data 8
+s/11/B/
+from :54
+M 100644 :7 renamed-file
+
+commit refs/heads/renamed-file
+mark :56
+author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200
+committer Thomas Gummerer <t.gummerer@gmail.com> 1556574319 +0100
+data 8
+s/12/B/
+from :55
+M 100644 :9 renamed-file
'
test_expect_success 'create reflog entry' '
+ ref=$(git rev-parse --short refs/notes/commits) &&
cat <<-EOF >expect &&
- a1d8fa6 refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
+ $ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
EOF
git reflog show refs/notes/commits >actual &&
test_cmp expect actual
'
test_expect_success 'show notes' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
test_expect_success 'show multi-line notes' '
test_commit 3rd &&
MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-multiline <<-EOF &&
- commit d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
test_commit 4th &&
echo "xyzzy" >note5 &&
git notes add -F note5 &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-F <<-EOF &&
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
'
test_expect_success 'git log --pretty=raw does not show notes' '
+ commit=$(git rev-parse HEAD) &&
+ tree=$(git rev-parse HEAD^{tree}) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
- tree 05ac65288c4c4b3b709a020ae94b2ece2f2201ae
- parent d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit $commit
+ tree $tree
+ parent $parent
author A U Thor <author@example.com> 1112912173 -0700
committer C O Mitter <committer@example.com> 1112912173 -0700
test_expect_success 'show -m notes' '
test_commit 5th &&
git notes add -m spam -m "foo${LF}bar${LF}baz" &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-m <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
test_expect_success 'remove note with add -f -F /dev/null' '
git notes add -f -F /dev/null &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-rm-F <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
test_expect_success 'remove note with "git notes remove"' '
git notes remove HEAD^ &&
git notes remove &&
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-rm-remove <<-EOF &&
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
${indent}5th
- commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
'
test_expect_success 'list notes with "git notes list"' '
- cat >expect <<-EOF &&
- c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
- c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit_2=$(git rev-parse 2nd) &&
+ commit_3=$(git rev-parse 3rd) &&
+ sort -t" " -k2 >expect <<-EOF &&
+ $(git rev-parse refs/notes/commits:$commit_2) $commit_2
+ $(git rev-parse refs/notes/commits:$commit_3) $commit_3
EOF
git notes list >actual &&
test_cmp expect actual
test_expect_success 'list specific note with "git notes list <object>"' '
cat >expect <<-EOF &&
- c18dc024e14f08d18d14eea0d747ff692d66d6a3
+ $(git rev-parse refs/notes/commits:$commit_3)
EOF
git notes list HEAD^^ >actual &&
test_cmp expect actual
'
test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
- cat >expect_list <<-EOF &&
- c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691
- 4b6ad22357cc8a1296720574b8d2fbc22fab0671 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
- c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290
+ commit_5=$(git rev-parse 5th) &&
+ sort -t" " -k2 >expect_list <<-EOF &&
+ $(git rev-parse refs/notes/commits:$commit_2) $commit_2
+ $(git rev-parse refs/notes/commits:$commit_3) $commit_3
+ $(git rev-parse refs/notes/commits:$commit_5) $commit_5
EOF
git notes list >actual &&
test_cmp expect_list actual
test_expect_success 'create other note on a different notes ref (setup)' '
test_commit 6th &&
GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
+ commit=$(git rev-parse HEAD) &&
cat >expect-not-other <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
'
test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-both <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
Notes (other):
${indent}other note
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
'
test_expect_success 'notes.displayRef respects order' '
+ commit=$(git rev-parse HEAD) &&
cat >expect-both-reversed <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
'
test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect-none <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
${indent}6th
- commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:17:13 2005 -0700
'
test_expect_success '--no-standard-notes' '
+ commit=$(git rev-parse HEAD) &&
cat >expect-commits <<-EOF &&
- commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:18:13 2005 -0700
'
test_expect_success 'create note from other note with "git notes add -C"' '
+ test_commit 7th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit fb01e0ca8c33b6cc0c6451dde747f97df567cb5c
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:19:13 2005 -0700
Notes:
${indent}order test
EOF
- test_commit 7th &&
git notes add -C $(git notes list HEAD^) &&
git log -1 >actual &&
test_cmp expect actual &&
'
test_expect_success 'create note from blob with "git notes add -C" reuses blob id' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:20:13 2005 -0700
'
test_expect_success 'create note from other note with "git notes add -c"' '
+ test_commit 9th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:21:13 2005 -0700
Notes:
${indent}yet another note
EOF
- test_commit 9th &&
MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
git log -1 >actual &&
test_cmp expect actual
'
test_expect_success 'append to note from other note with "git notes append -C"' '
+ commit=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:21:13 2005 -0700
'
test_expect_success 'create note from other note with "git notes append -c"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:22:13 2005 -0700
'
test_expect_success 'append to note from other note with "git notes append -c"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:22:13 2005 -0700
'
test_expect_success 'copy note with "git notes copy"' '
+ test_commit 11th &&
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:23:13 2005 -0700
${indent}
${indent}yet another note
EOF
- test_commit 11th &&
git notes copy HEAD^ HEAD &&
git log -1 >actual &&
test_cmp expect actual &&
'
test_expect_success 'allow overwrite with "git notes copy -f"' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:23:13 2005 -0700
'
test_expect_success 'git notes copy --stdin' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit e871aa61182b1d95d0a6fb75445d891722863b6b
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:25:13 2005 -0700
${indent}
${indent}yet another note
- commit 65e263ded02ae4e8839bc151095113737579dc12
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:24:13 2005 -0700
'
test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
+ test_commit 14th &&
+ test_commit 15th &&
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
${indent}15th
- commit 07c85d77059393ed0154b8c96906547a59dfcddd
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:26:13 2005 -0700
${indent}14th
EOF
- test_commit 14th &&
- test_commit 15th &&
(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
git notes copy --for-rewrite=foo &&
'
test_expect_success 'git notes copy --for-rewrite (enabled)' '
+ commit=$(git rev-parse HEAD) &&
+ parent=$(git rev-parse HEAD^) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
${indent}
${indent}yet another note
- commit 07c85d77059393ed0154b8c96906547a59dfcddd
+ commit $parent
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:26:13 2005 -0700
'
test_expect_success 'git notes copy --for-rewrite (overwrite)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
'
test_expect_success 'git notes copy --for-rewrite (append)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
'
test_expect_success 'git notes copy --for-rewrite (append two to one)' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
'
test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
'
test_expect_success 'GIT_NOTES_REWRITE_REF works' '
+ commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ commit $commit
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:27:13 2005 -0700
git ls-tree -r --name-only refs/notes/commits |
while read path
do
- case "$path" in
- ??/??????????????????????????????????????)
- : true
- ;;
- *)
+ echo $path | grep "^../[0-9a-f]*$" || {
echo "Invalid path \"$path\"" &&
- return 1
- ;;
- esac
+ return 1;
+ }
done
'
git ls-tree -r --name-only refs/notes/commits |
while read path
do
- case "$path" in
- ????????????????????????????????????????)
- : true
- ;;
- *)
+ echo $path | grep -v "^../.*" || {
echo "Invalid path \"$path\"" &&
- return 1
- ;;
- esac
+ return 1;
+ }
done
'
test_tick &&
git commit -m 1st &&
git notes add -m "Note #1" &&
+ first=$(git rev-parse HEAD) &&
: > file2 &&
git add file2 &&
test_tick &&
git commit -m 2nd &&
git notes add -m "Note #2" &&
+ second=$(git rev-parse HEAD) &&
: > file3 &&
git add file3 &&
test_tick &&
git commit -m 3rd &&
- COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+ third=$(git rev-parse HEAD) &&
+ COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
test -f $COMMIT_FILE &&
test-tool chmtime =+0 $COMMIT_FILE &&
git notes add -m "Note #3"
'
cat > expect <<END_OF_LOG
-commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+commit $third
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
Notes:
Note #3
-commit 08341ad9e94faa089d60fd3f523affb25c6da189
+commit $second
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
Notes:
Note #2
-commit ab5f302035f2e7aaf04265f08b42034c23256e1f
+commit $first
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:13:13 2005 -0700
test_expect_success 'verify that commits are gone' '
- test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git cat-file -p $third &&
+ git cat-file -p $second &&
+ git cat-file -p $first
'
test_expect_success 'verify that notes are still present' '
- git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ git notes show $third &&
+ git notes show $second &&
+ git notes show $first
'
test_expect_success 'prune -n does not remove notes' '
test_cmp expect actual
'
-cat > expect <<EOF
-5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-EOF
test_expect_success 'prune -n lists prunable notes' '
-
+ echo $third >expect &&
git notes prune -n > actual &&
test_cmp expect actual
'
test_expect_success 'verify that notes are gone' '
- test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git notes show $third &&
+ git notes show $second &&
+ git notes show $first
'
test_expect_success 'remove some commits' '
git gc --prune=now
'
-cat > expect <<EOF
-08341ad9e94faa089d60fd3f523affb25c6da189
-EOF
-
test_expect_success 'prune -v notes' '
+ echo $second >expect &&
git notes prune -v > actual &&
test_cmp expect actual
'
test_expect_success 'verify that notes are gone' '
- test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
- test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
- git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
+ test_must_fail git notes show $third &&
+ test_must_fail git notes show $second &&
+ git notes show $first
'
test_done
test_expect_success 'Add a few hundred commits w/notes to trigger fanout (x -> y)' '
git update-ref refs/notes/y refs/notes/x &&
git config core.notesRef refs/notes/y &&
- i=5 &&
- while test $i -lt $num
+ test_commit_bulk --start=6 --id=commit $((num - 5)) &&
+ i=0 &&
+ while test $i -lt $((num - 5))
do
- i=$(($i + 1)) &&
- test_commit "commit$i" >/dev/null &&
- git notes add -m "notes for commit$i" || return 1
+ git notes add -m "notes for commit$i" HEAD~$i || return 1
+ i=$((i + 1))
done &&
test "$(git rev-parse refs/notes/y)" != "$(git rev-parse refs/notes/x)" &&
# Expected number of commits and notes
test_cmp From_.msg out
'
-test_expect_success 'rebase--am.sh and --show-current-patch' '
+test_expect_success 'rebase --am and --show-current-patch' '
test_create_repo conflict-apply &&
(
cd conflict-apply &&
)
'
+test_expect_success 'rebase --am and .gitattributes' '
+ test_create_repo attributes &&
+ (
+ cd attributes &&
+ test_commit init &&
+ git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+ git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+ test_commit second &&
+ git checkout -b test HEAD^ &&
+
+ echo "*.txt filter=test" >.gitattributes &&
+ git add .gitattributes &&
+ test_commit third &&
+
+ echo "This text is smudged." >a.txt &&
+ git add a.txt &&
+ test_commit fourth &&
+
+ git checkout -b removal HEAD^ &&
+ git rm .gitattributes &&
+ git add -u &&
+ test_commit fifth &&
+ git cherry-pick test &&
+
+ git checkout test &&
+ git rebase master &&
+ grep "smudged" a.txt &&
+
+ git checkout removal &&
+ git reset --hard &&
+ git rebase master &&
+ grep "clean" a.txt
+ )
+'
+
test_expect_success 'rebase--merge.sh and --show-current-patch' '
test_create_repo conflict-merge &&
(
. "$TEST_DIRECTORY"/lib-rebase.sh
-# WARNING: Modifications to the initial repository can change the SHA ID used
-# in the expect2 file for the 'stop on conflicting pick' test.
-
test_expect_success 'setup' '
test_commit A file1 &&
test_commit B file1 &&
test_i18ncmp expected actual
'
-LF='
-'
test_expect_success 'rebase -x with newline in command fails' '
test_when_finished "git rebase --abort ||:" &&
test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
set_fake_editor &&
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
- test G = $(git cat-file commit HEAD | sed -ne \$p)
+ test G = $(git cat-file commit HEAD | sed -ne \$p) &&
+ blob1=$(git rev-parse --short HEAD^:file1) &&
+ blob2=$(git rev-parse --short HEAD:file1) &&
+ commit=$(git rev-parse --short HEAD)
'
test_expect_success 'stop on conflicting pick' '
- cat >expect <<-\EOF &&
+ cat >expect <<-EOF &&
diff --git a/file1 b/file1
- index f70f10e..fd79235 100644
+ index $blob1..$blob2 100644
--- a/file1
+++ b/file1
@@ -1 +1 @@
-A
+G
EOF
- cat >expect2 <<-\EOF &&
+ cat >expect2 <<-EOF &&
<<<<<<< HEAD
D
=======
G
- >>>>>>> 5d18e54... G
+ >>>>>>> $commit... G
EOF
git tag new-branch1 &&
set_fake_editor &&
git checkout B &&
set_fake_editor &&
test_must_fail env FAKE_LINES="2" git rebase -i --root &&
- git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
+ git cat-file commit HEAD | grep "^tree $EMPTY_TREE" &&
git rebase --abort
'
test_expect_code 1 grep " emp" error
'
-test_expect_success 'short SHA-1 setup' '
+test_expect_success SHA1 'short SHA-1 setup' '
test_when_finished "git checkout master" &&
git checkout --orphan collide &&
git rm -rf . &&
)
'
-test_expect_success 'short SHA-1 collide' '
+test_expect_success SHA1 'short SHA-1 collide' '
test_when_finished "reset_rebase && git checkout master" &&
git checkout collide &&
(
git rebase --continue
'
+test_expect_success 'rebase -r passes merge strategy options correctly' '
+ rm -fr .git/rebase-* &&
+ git reset --hard commit-new-file-F3-on-topic-branch &&
+ test_commit merge-theirs &&
+ git reset --hard HEAD^ &&
+ test_commit some-other-commit &&
+ test_tick &&
+ git merge --no-ff merge-theirs &&
+ FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
+ -s recursive --strategy-option=theirs HEAD~2 &&
+ test_commit force-change-ours &&
+ git rebase --continue
+'
+
test_expect_success '--skip after failed fixup cleans commit message' '
test_when_finished "test_might_fail git rebase --abort" &&
git checkout -b with-conflicting-fixup &&
echo conflicting-change >file2 &&
git add . &&
test_tick &&
- git commit -m "related commit"
+ git commit -m "related commit" &&
+ remove_progress_re="$(printf "s/.*\\r//")"
'
create_expected_success_am () {
q_to_cr >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
HEAD is now at $(git rev-parse --short feature-branch) third commit
- Rebasing (1/2)QRebasing (2/2)QApplied autostash.
- Q QSuccessfully rebased and updated refs/heads/rebased-feature-branch.
+ Applied autostash.
+ Successfully rebased and updated refs/heads/rebased-feature-branch.
EOF
}
}
create_expected_failure_interactive () {
- q_to_cr >expected <<-EOF
+ cat >expected <<-EOF
$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
HEAD is now at $(git rev-parse --short feature-branch) third commit
- Rebasing (1/2)QRebasing (2/2)QApplying autostash resulted in conflicts.
+ Applying autostash resulted in conflicts.
Your changes are safe in the stash.
You can run "git stash pop" or "git stash drop" at any time.
- Q QSuccessfully rebased and updated refs/heads/rebased-feature-branch.
+ Successfully rebased and updated refs/heads/rebased-feature-branch.
EOF
}
suffix=interactive
fi &&
create_expected_success_$suffix &&
- test_i18ncmp expected actual
+ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
suffix=interactive
fi &&
create_expected_failure_$suffix &&
- test_i18ncmp expected actual
+ sed "$remove_progress_re" <actual >actual2 &&
+ test_i18ncmp expected actual2
'
}
test_must_fail git rebase --preserve-merges --rebase-merges A
'
-test_expect_success '--rebase-merges incompatible with --strategy' '
- git checkout B^0 &&
- test_must_fail git rebase --rebase-merges -s resolve A
-'
-
-test_expect_success '--rebase-merges incompatible with --strategy-option' '
- git checkout B^0 &&
- test_must_fail git rebase --rebase-merges -Xignore-space-change A
-'
-
test_done
git log --pretty=format:%s -1 "$1"
}
+# There are a few bugs in the rebase with regards to the subtree strategy, and
+# this test script tries to document them. First, the following commit history
+# is generated (the onelines are shown, time flows from left to right):
+#
+# master1 - master2 - master3
+# \
+# README ---------------------- Add subproject master - master4 - files_subtree/master5
+#
+# Where the merge moves the files master[123].t into the subdirectory
+# files_subtree/ and master4 as well as files_subtree/master5 add files to that
+# directory directly.
+#
+# Then, in subsequent test cases, `git filter-branch` is used to distill just
+# the commits that touch files_subtree/. To give it a final pre-rebase touch,
+# an empty commit is added on top. The pre-rebase commit history looks like
+# this:
+#
+# Add subproject master - master4 - files_subtree/master5 - Empty commit
+#
+# where the root commit adds three files: master1.t, master2.t and master3.t.
+#
+# This commit history is then rebased onto `master3` with the
+# `-Xsubtree=files_subtree` option in three different ways:
+#
+# 1. using `--preserve-merges`
+# 2. using `--preserve-merges` and --keep-empty
+# 3. without specifying a rebase backend
+
test_expect_success 'setup' '
test_commit README &&
- mkdir files &&
- (
- cd files &&
- git init &&
- test_commit master1 &&
- test_commit master2 &&
- test_commit master3
- ) &&
- git fetch files master &&
- git branch files-master FETCH_HEAD &&
- git read-tree --prefix=files_subtree files-master &&
- git checkout -- files_subtree &&
- tree=$(git write-tree) &&
- head=$(git rev-parse HEAD) &&
- rev=$(git rev-parse --verify files-master^0) &&
- commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
- git update-ref HEAD $commit &&
- (
- cd files_subtree &&
- test_commit master4
- ) &&
- test_commit files_subtree/master5
-'
-# FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
- 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
- reset_rebase &&
- git checkout -b rebase-preserve-merges-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
+ git init files &&
+ test_commit -C files master1 &&
+ test_commit -C files master2 &&
+ test_commit -C files master3 &&
+
+ : perform subtree merge into files_subtree/ &&
+ git fetch files refs/heads/master:refs/heads/files-master &&
+ git merge -s ours --no-commit --allow-unrelated-histories \
+ files-master &&
+ git read-tree --prefix=files_subtree -u files-master &&
+ git commit -m "Add subproject master" &&
+
+ : add two extra commits to rebase &&
+ test_commit -C files_subtree master4 &&
+ test_commit files_subtree/master5 &&
+
+ git checkout -b to-rebase &&
+ git fast-export --no-data HEAD -- files_subtree/ |
+ sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
+ git fast-import --force --quiet &&
+ git reset --hard &&
+ git commit -m "Empty commit" --allow-empty
'
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
- 'Rebase -Xsubtree --preserve-merges --onto commit 5' '
+# FAILURE: Does not preserve master4.
+test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-preserve-merges-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
+ git checkout -b rebase-preserve-merges to-rebase &&
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+ verbose test "$(commit_message HEAD~)" = "master4" &&
verbose test "$(commit_message HEAD)" = "files_subtree/master5"
'
# FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
- 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
- reset_rebase &&
- git checkout -b rebase-keep-empty-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
- 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
- reset_rebase &&
- git checkout -b rebase-keep-empty-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-
-# FAILURE: Does not preserve Empty.
-test_expect_failure REBASE_P \
- 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-keep-empty-empty master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
+ git checkout -b rebase-keep-empty to-rebase &&
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 4' '
+test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
reset_rebase &&
- git checkout -b rebase-onto-4 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+ git checkout -b rebase-onto to-rebase &&
+ test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
+ : first pick results in no changes &&
+ git rebase --continue &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+ verbose test "$(commit_message HEAD)" = "Empty commit"
'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 5' '
- reset_rebase &&
- git checkout -b rebase-onto-5 master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto empty commit' '
+test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' '
reset_rebase &&
- git checkout -b rebase-onto-empty master &&
- git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
- git commit -m "Empty commit" --allow-empty &&
- git rebase -Xsubtree=files_subtree --onto files-master master &&
+ git checkout -b rebase-merges-onto to-rebase &&
+ test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
+ : first pick results in no changes &&
+ git rebase --continue &&
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
test_commit A &&
git checkout -b first &&
test_commit B &&
+ b=$(git rev-parse --short HEAD) &&
git checkout master &&
test_commit C &&
+ c=$(git rev-parse --short HEAD) &&
test_commit D &&
+ d=$(git rev-parse --short HEAD) &&
git merge --no-commit B &&
test_tick &&
git commit -m E &&
git tag -m E E &&
+ e=$(git rev-parse --short HEAD) &&
git checkout -b second C &&
test_commit F &&
+ f=$(git rev-parse --short HEAD) &&
test_commit G &&
+ g=$(git rev-parse --short HEAD) &&
git checkout master &&
git merge --no-commit G &&
test_tick &&
git commit -m H &&
+ h=$(git rev-parse --short HEAD) &&
git tag -m H H &&
git checkout A &&
test_commit conflicting-G G.t
'
test_expect_success 'generate correct todo list' '
- cat >expect <<-\EOF &&
+ cat >expect <<-EOF &&
label onto
reset onto
- pick d9df450 B
+ pick $b B
label E
reset onto
- pick 5dee784 C
+ pick $c C
label branch-point
- pick ca2c861 F
- pick 088b00a G
+ pick $f F
+ pick $g G
label H
reset branch-point # C
- pick 12bd07b D
- merge -C 2051b56 E # E
- merge -C 233d48a H # H
+ pick $d D
+ merge -C $e E # E
+ merge -C $h H # H
EOF
grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
'
+test_expect_success 'fast-forward merge -c still rewords' '
+ git checkout -b fast-forward-merge-c H &&
+ (
+ set_fake_editor &&
+ FAKE_COMMIT_MESSAGE=edited \
+ GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
+ git rebase -ir @^
+ ) &&
+ echo edited >expected &&
+ git log --pretty=format:%B -1 >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'with a branch tip that was cherry-picked already' '
git checkout -b already-upstream master &&
base="$(git rev-parse --verify HEAD)" &&
test_path_is_missing .git/MERGE_HEAD
'
+test_expect_success '--rebase-merges with strategies' '
+ git checkout -b with-a-strategy F &&
+ test_tick &&
+ git merge -m "Merge conflicting-G" conflicting-G &&
+
+ : first, test with a merge strategy option &&
+ git rebase -ir -Xtheirs G &&
+ echo conflicting-G >expect &&
+ test_cmp expect G.t &&
+
+ : now, try with a merge strategy other than recursive &&
+ git reset --hard @{1} &&
+ write_script git-merge-override <<-\EOF &&
+ echo overridden$1 >>G.t
+ git add G.t
+ EOF
+ PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
+ test_write_lines G overridden--xopt >expect &&
+ test_cmp expect G.t
+'
+
test_done
git add file1 &&
test_tick &&
git commit -m "second" &&
- git tag second
+ git tag second &&
+ test_oid_cache <<-EOF
+ cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
+ cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
+ EOF
'
test_expect_success 'cherry-pick using --ff fast forwards' '
git add file2 &&
git commit --amend -m "file2" &&
git cherry-pick --ff first &&
- test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
+ test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
'
test_expect_success 'cherry-pick --ff on unborn branch' '
test_path_is_missing .git/sequencer
'
+test_expect_success 'cherry-pick --skip requires cherry-pick in progress' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick --skip
+'
+
+test_expect_success 'revert --skip requires revert in progress' '
+ pristine_detach initial &&
+ test_must_fail git revert --skip
+'
+
+test_expect_success 'cherry-pick --skip to skip commit' '
+ pristine_detach initial &&
+ test_must_fail git cherry-pick anotherpick &&
+ test_must_fail git revert --skip &&
+ git cherry-pick --skip &&
+ test_cmp_rev initial HEAD &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD
+'
+
+test_expect_success 'revert --skip to skip commit' '
+ pristine_detach anotherpick &&
+ test_must_fail git revert anotherpick~1 &&
+ test_must_fail git cherry-pick --skip &&
+ git revert --skip &&
+ test_cmp_rev anotherpick HEAD
+'
+
+test_expect_success 'skip "empty" commit' '
+ pristine_detach picked &&
+ test_commit dummy foo d &&
+ test_must_fail git cherry-pick anotherpick &&
+ git cherry-pick --skip &&
+ test_cmp_rev dummy HEAD
+'
+
+test_expect_success 'skip a commit and check if rest of sequence is correct' '
+ pristine_detach initial &&
+ echo e >expect &&
+ cat >expect.log <<-EOF &&
+ OBJID
+ :100644 100644 OBJID OBJID M foo
+ OBJID
+ :100644 100644 OBJID OBJID M foo
+ OBJID
+ :100644 100644 OBJID OBJID M unrelated
+ OBJID
+ :000000 100644 OBJID OBJID A foo
+ :000000 100644 OBJID OBJID A unrelated
+ EOF
+ test_must_fail git cherry-pick base..yetanotherpick &&
+ test_must_fail git cherry-pick --skip &&
+ echo d >foo &&
+ git add foo &&
+ git cherry-pick --continue &&
+ {
+ git rev-list HEAD |
+ git diff-tree --root --stdin |
+ sed "s/$OID_REGEX/OBJID/g"
+ } >actual.log &&
+ test_cmp expect foo &&
+ test_cmp expect.log actual.log
+'
+
+test_expect_success 'check advice when we move HEAD by committing' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: there is nothing to skip
+ hint: have you committed already?
+ hint: try "git cherry-pick --continue"
+ fatal: cherry-pick failed
+ EOF
+ test_must_fail git cherry-pick base..yetanotherpick &&
+ echo c >foo &&
+ git commit -a &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD &&
+ test_must_fail git cherry-pick --skip 2>advice &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'selectively advise --skip while launching another sequence' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: cherry-pick is already in progress
+ hint: try "git cherry-pick (--continue | --skip | --abort | --quit)"
+ fatal: cherry-pick failed
+ EOF
+ test_must_fail git cherry-pick picked..yetanotherpick &&
+ test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+ test_i18ncmp expect advice &&
+ cat >expect <<-EOF &&
+ error: cherry-pick is already in progress
+ hint: try "git cherry-pick (--continue | --abort | --quit)"
+ fatal: cherry-pick failed
+ EOF
+ git reset --merge &&
+ test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'allow skipping commit but not abort for a new history' '
+ pristine_detach initial &&
+ cat >expect <<-EOF &&
+ error: cannot abort from a branch yet to be born
+ fatal: cherry-pick failed
+ EOF
+ git checkout --orphan new_disconnected &&
+ git reset --hard &&
+ test_must_fail git cherry-pick anotherpick &&
+ test_must_fail git cherry-pick --abort 2>advice &&
+ git cherry-pick --skip &&
+ test_i18ncmp expect advice
+'
+
+test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
+ pristine_detach initial &&
+ git rm --cached unrelated &&
+ git commit -m "untrack unrelated" &&
+ test_must_fail git cherry-pick initial base &&
+ test_path_is_missing .git/CHERRY_PICK_HEAD &&
+ git cherry-pick --skip
+'
+
test_expect_success '--quit does not complain when no cherry-pick is in progress' '
pristine_detach initial &&
git cherry-pick --quit
'
test_expect_success 'choking "git rm" should not let it die with cruft' '
+ test_oid_init &&
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 &&
+ hash=$(test_oid deadbeef) &&
while test $i -lt 12000
do
- echo "100644 1234567890123456789012345678901234567890 0 some-file-$i"
+ echo "100644 $hash 0 some-file-$i"
i=$(( $i + 1 ))
done | git update-index --index-info &&
git rm -n "some-file-*" | : &&
# first create a commit, so we have a valid object/type
# for the tag.
test_expect_success 'setup' '
+ test_oid_init &&
echo Hello >A &&
git update-index --add A &&
git commit -m "Initial commit" &&
# 4. type line label check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
xxxx tag
tag mytag
tagger . <> 0 +0000
EOF
-check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$'
+check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
############################################################
# 5. type line eol check
-echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig
+echo "object $head" >tag.sig
printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig
-check_verify_failure '"type" line eol check' '^error: char48: .*"\\n"$'
+check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$'
############################################################
# 6. tag line label check #1
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type tag
xxx mytag
tagger . <> 0 +0000
EOF
check_verify_failure '"tag" line label check #1' \
- '^error: char57: no "tag " found$'
+ '^error: char.*: no "tag " found$'
############################################################
# 7. tag line label check #2
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type taggggggggggggggggggggggggggggggg
tag
EOF
check_verify_failure '"tag" line label check #2' \
- '^error: char87: no "tag " found$'
+ '^error: char.*: no "tag " found$'
############################################################
# 8. type line type-name length check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $head
type taggggggggggggggggggggggggggggggg
tag mytag
EOF
check_verify_failure '"type" line type-name length check' \
- '^error: char53: type too long$'
+ '^error: char.*: type too long$'
############################################################
# 9. verify object (SHA1/type) check
cat >tag.sig <<EOF
-object 779e9b33986b1c2670fff52c5067603117b3e895
+object $(test_oid deadbeef)
type tagggg
tag mytag
tagger . <> 0 +0000
EOF
check_verify_failure 'verify tag-name check' \
- '^error: char67: could not verify tag name$'
+ '^error: char.*: could not verify tag name$'
############################################################
# 11. tagger line label check #1
EOF
check_verify_failure '"tagger" line label check #1' \
- '^error: char70: could not find "tagger "$'
+ '^error: char.*: could not find "tagger "$'
############################################################
# 12. tagger line label check #2
EOF
check_verify_failure '"tagger" line label check #2' \
- '^error: char70: could not find "tagger "$'
+ '^error: char.*: could not find "tagger "$'
############################################################
# 13. disallow missing tag author name
EOF
check_verify_failure 'disallow missing tag author name' \
- '^error: char77: missing tagger name$'
+ '^error: char.*: missing tagger name$'
############################################################
# 14. disallow missing tag author name
EOF
check_verify_failure 'disallow malformed tagger' \
- '^error: char77: malformed tagger field$'
+ '^error: char.*: malformed tagger field$'
############################################################
# 15. allow empty tag email
EOF
check_verify_failure 'disallow spaces in tag email' \
- '^error: char77: malformed tagger field$'
+ '^error: char.*: malformed tagger field$'
############################################################
# 17. disallow missing tag timestamp
EOF
check_verify_failure 'disallow missing tag timestamp' \
- '^error: char107: missing tag timestamp$'
+ '^error: char.*: missing tag timestamp$'
############################################################
# 18. detect invalid tag timestamp1
EOF
check_verify_failure 'detect invalid tag timestamp1' \
- '^error: char107: missing tag timestamp$'
+ '^error: char.*: missing tag timestamp$'
############################################################
# 19. detect invalid tag timestamp2
EOF
check_verify_failure 'detect invalid tag timestamp2' \
- '^error: char111: malformed tag timestamp$'
+ '^error: char.*: malformed tag timestamp$'
############################################################
# 20. detect invalid tag timezone1
EOF
check_verify_failure 'detect invalid tag timezone1' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 21. detect invalid tag timezone2
EOF
check_verify_failure 'detect invalid tag timezone2' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 22. detect invalid tag timezone3
EOF
check_verify_failure 'detect invalid tag timezone3' \
- '^error: char118: malformed tag timezone$'
+ '^error: char.*: malformed tag timezone$'
############################################################
# 23. detect invalid header entry
EOF
check_verify_failure 'detect invalid header entry' \
- '^error: char124: trailing garbage in tag header$'
+ '^error: char.*: trailing garbage in tag header$'
############################################################
# 24. create valid tag
. ./test-lib.sh
+diff_cmp () {
+ for i in "$1" "$2"
+ do
+ sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+ -e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+ -e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \
+ "$i" >"$i.compare" || return 1
+ done &&
+ test_cmp "$1.compare" "$2.compare" &&
+ rm -f "$1.compare" "$2.compare"
+}
+
test_expect_success 'stash some dirty working directory' '
echo 1 >file &&
git add file &&
test_expect_success 'parents of stash' '
test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
git diff stash^2..stash >output &&
- test_cmp expect output
+ diff_cmp expect output
'
test_expect_success 'applying bogus stash does nothing' '
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
test $(git rev-parse HEAD) = $(git rev-parse master^) &&
git diff --cached >output &&
- test_cmp expect output &&
+ diff_cmp expect output &&
git diff >output &&
- test_cmp expect1 output &&
+ diff_cmp expect1 output &&
git add file &&
git commit -m alternate\ second &&
git diff master..stashbranch >output &&
- test_cmp output expect2 &&
+ diff_cmp output expect2 &&
test 0 = $(git stash list | wc -l)
'
+bar
EOF
git stash show -p ${STASH_ID} >actual &&
- test_cmp expected actual
+ diff_cmp expected actual
'
test_expect_success 'stash show - no stashes on stack, stash-like argument' '
+foo
EOF
git stash show -p ${STASH_ID} >actual &&
- test_cmp expected actual
+ diff_cmp expected actual
'
test_expect_success 'stash show --patience shows diff' '
+foo
EOF
git stash show --patience ${STASH_ID} >actual &&
- test_cmp expected actual
+ diff_cmp expected actual
'
test_expect_success 'drop: fail early if specified stash is not a stash ref' '
git diff-index --cached --quiet HEAD &&
test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
git diff stash^..stash >output &&
- test_cmp expect output
+ diff_cmp expect output
'
test_expect_success 'store called with invalid commit' '
+working
EOF
git stash list --format=%gd -p >actual &&
- test_cmp expect actual
+ diff_cmp expect actual
'
test_expect_success 'stash list --cc shows combined diff' '
++working
EOF
git stash list --format=%gd -p --cc >actual &&
- test_cmp expect actual
+ diff_cmp expect actual
'
test_expect_success 'stash is not confused by partial renames' '
)
'
+test_expect_success 'stash --keep-index with file deleted in index does not resurrect it on disk' '
+ test_commit to-remove to-remove &&
+ git rm to-remove &&
+ git stash --keep-index &&
+ test_path_is_missing to-remove
+'
+
test_done
test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' '
git diff-files --no-patch --patch-with-raw >actual &&
- grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M path0\$" actual &&
+ grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual &&
tail -n +4 actual >actual-patch &&
compare_diff_patch expected actual-patch
'
'
. ./test-lib.sh
+
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
-cat >.test-plain-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 040000 0000000000000000000000000000000000000000 6d50f65d3bdab91c63444294d38f08aeff328e42 A DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 5e5f22072bb39f6e12cf663a57cb634c76eefb49 M Z
+test_oid_init
+
+test_oid_cache <<\EOF
+aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
+aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
+
+aa_2 sha1:6aa2b5335b16431a0ef71e5c0a28be69183cf6a2
+aa_2 sha256:6eaa3437de83f145a4aaa6ba355303075ade547b128ec6a2cd00a81ff7ce7a56
+
+an_1 sha1:7e426fb079479fd67f6d81f984e4ec649a44bc25
+an_1 sha256:8f92a0bec99e399a38e3bd0e1bf19fbf121e0160efb29b857df79d439f1c4536
+
+dd_1 sha1:bcc68ef997017466d5c9094bcf7692295f588c9a
+dd_1 sha256:07e17428b00639b85485d2b01083d219e2f3e3ba8579e9ca44e9cc8dd554d952
+
+df_1 sha1:6d50f65d3bdab91c63444294d38f08aeff328e42
+df_1 sha256:e367cecc27e9bf5451b1c65828cb21938d36a5f8e39c1b03ad6509cc36bb8e9d
+
+df_2 sha1:71420ab81e254145d26d6fc0cddee64c1acd4787
+df_2 sha256:0f0a86d10347ff6921d03a3c954679f3f1d14fa3d5cd82f57b32c09755f3a47d
+
+dfd1 sha1:68a6d8b91da11045cf4aa3a5ab9f2a781c701249
+dfd1 sha256:f3bd3265b02b6978ce86490d8ad026c573639c974b3de1d9faf30d8d5a77d3d5
+
+dm_1 sha1:141c1f1642328e4bc46a7d801a71da392e66791e
+dm_1 sha256:c89f8656e7b94e21ee5fbaf0e2149bbf783c51edbe2ce110349cac13059ee7ed
+
+dm_2 sha1:3c4d8de5fbad08572bab8e10eef8dbb264cf0231
+dm_2 sha256:83a572e37e0c94086294dae2cecc43d9131afd6f6c906e495c78972230b54988
+
+dn_1 sha1:35abde1506ddf806572ff4d407bd06885d0f8ee9
+dn_1 sha256:775d5852582070e620be63327bfa515fab8f71c7ac3e4f0c3cd6267b4377ba28
+
+ll_2 sha1:1d41122ebdd7a640f29d3c9cc4f9d70094374762
+ll_2 sha256:7917b4948a883cfed0a77d3d5a625dc8577d6ddcc3c6c3bbc56c4d4226a2246d
+
+md_1 sha1:03f24c8c4700babccfd28b654e7e8eac402ad6cd
+md_1 sha256:fc9f30369b978595ad685ba11ca9a17de0af16d79cd4b629975f4f1590033902
+
+md_2 sha1:103d9f89b50b9aad03054b579be5e7aa665f2d57
+md_2 sha256:fc78ec75275628762fe520479a6b2398dec295ce7aabcb1d15e5963c7b4e9317
+
+mm_1 sha1:b258508afb7ceb449981bd9d63d2d3e971bf8d34
+mm_1 sha256:a4b7847d228e900e3000285e240c20fd96f9dd41ce1445305f6eada126d4a04a
+
+mm_2 sha1:b431b272d829ff3aa4d1a5085f4394ab4d3305b6
+mm_2 sha256:3f8b83ea36aacf689bcf1a1290a9a8ed341564d32682ea6f76fea9a979186782
+
+mm_3 sha1:19989d4559aae417fedee240ccf2ba315ea4dc2b
+mm_3 sha256:71b3bfc5747ac033fff9ea0ab39ee453a3af2969890e75d6ef547b87544e2681
+
+mn_1 sha1:bd084b0c27c7b6cc34f11d6d0509a29be3caf970
+mn_1 sha256:47a67450583d7a329eb01a7c4ba644945af72c0ed2c7c95eb5a00d6e46d4d483
+
+mn_2 sha1:a716d58de4a570e0038f5c307bd8db34daea021f
+mn_2 sha256:f95104c1ebe27acb84bac25a7be98c71f6b8d3054b21f357a5be0c524ad97e08
+
+nm_1 sha1:c8f25781e8f1792e3e40b74225e20553041b5226
+nm_1 sha256:09baddc7afaa62e62e152c23c9c3ab94bf15a3894031e227e9be7fe68e1f4e49
+
+nm_2 sha1:cdb9a8c3da571502ac30225e9c17beccb8387983
+nm_2 sha256:58b5227956ac2d2a08d0efa513c0ae37430948b16791ea3869a1308dbf05536d
+
+na_1 sha1:15885881ea69115351c09b38371f0348a3fb8c67
+na_1 sha256:18e4fdd1670cd7968ee23d35bfd29e5418d56fb190c840094c1c57ceee0aad8f
+
+nd_1 sha1:a4e179e4291e5536a5e1c82e091052772d2c5a93
+nd_1 sha256:07dac9b01d00956ea0c65bd993d7de4864aeef2ed3cbb1255d9f1d949fcd6df6
+
+ss_1 sha1:40c959f984c8b89a2b02520d17f00d717f024397
+ss_1 sha256:50fc1b5df74d9910db2f9270993484235f15b69b75b01bcfb53e059289d14af9
+
+ss_2 sha1:2ac547ae9614a00d1b28275de608131f7a0e259f
+ss_2 sha256:a90f02e6044f1497d13db587d22ab12f90150a7d1e084afcf96065fab35ae2bc
+
+tt_1 sha1:4ac13458899ab908ef3b1128fa378daefc88d356
+tt_1 sha256:c53113c7dd5060e86b5b251428bd058f6726f66273c6a24bff1c61a04f498dd3
+
+tt_2 sha1:4c86f9a85fbc5e6804ee2e17a797538fbe785bca
+tt_2 sha256:0775f2a296129a7cf2862b46bc0e88c14d593f2773a3e3fb1c5193db6f5a7e77
+
+tt_3 sha1:c4e4a12231b9fa79a0053cb6077fcb21bb5b135a
+tt_3 sha256:47860f93cdd211f96443e0560f21c57ab6c2f4b0ac27ff03651a352e53fe8484
+
+z__1 sha1:7d670fdcdb9929f6c7dac196ff78689cd1c566a1
+z__1 sha256:44d0f37aff5e51cfcfdd1134c93a6419bcca7b9964f792ffcd5f9b4fcba1ee63
+
+z__2 sha1:5e5f22072bb39f6e12cf663a57cb634c76eefb49
+z__2 sha256:d29de162113190fed104eb5f010820cef4e315f89b9326e8497f7219fb737894
+
+z__3 sha1:1ba523955d5160681af65cb776411f574c1e8155
+z__3 sha256:07422d772b07794ab4369a5648e617719f89c2d2212cbeab05d97214b6471636
+
+zaa1 sha1:8acb8e9750e3f644bf323fcf3d338849db106c77
+zaa1 sha256:e79b029282c8abec2d9f3f7faceaf2a1405e02d1f368e66450ae66cf5b68d1f4
+
+zaa2 sha1:6c0b99286d0bce551ac4a7b3dff8b706edff3715
+zaa2 sha256:c82bd78c3e69ea1796e6b1a7a3ba45bb106c50e819296475b862123d3f5cc5a0
+
+zan1 sha1:087494262084cefee7ed484d20c8dc0580791272
+zan1 sha256:4b159eb3804d05599023dd074f771d06d02870f4ab24a7165add8ac3d703b8d3
+
+zdd1 sha1:879007efae624d2b1307214b24a956f0a8d686a8
+zdd1 sha256:eecfdd4d8092dd0363fb6d4548b54c6afc8982c3ed9b34e393f1d6a921d8eaa3
+
+zdm1 sha1:9b541b2275c06e3a7b13f28badf5294e2ae63df4
+zdm1 sha256:ab136e88e19a843c4bf7713d2090d5a2186ba16a6a80dacc12eeddd256a8e556
+
+zdm2 sha1:d77371d15817fcaa57eeec27f770c505ba974ec1
+zdm2 sha256:1c1a5f57363f46a15d95ce8527b3c2c158d88d16853b4acbf81bd20fd2c89a46
+
+zdn1 sha1:beb5d38c55283d280685ea21a0e50cfcc0ca064a
+zdn1 sha256:0f0eca66183617b0aa5ad74b256540329f841470922ca6760263c996d825eb18
+
+zmd1 sha1:d41fda41b7ec4de46b43cb7ea42a45001ae393d5
+zmd1 sha256:1ed32d481852eddf31a0ce12652a0ad14bf5b7a842667b5dbb0b50f35bf1c80a
+
+zmd2 sha1:a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9
+zmd2 sha256:b238da211b404f8917df2d9c6f7030535e904b2186131007a3c292ec6902f933
+
+zmm1 sha1:4ca22bae2527d3d9e1676498a0fba3b355bd1278
+zmm1 sha256:072b1d85b5f34fabc99dfa46008c5418df68302d3e317430006f49b32d244226
+
+zmm2 sha1:61422ba9c2c873416061a88cd40a59a35b576474
+zmm2 sha256:81dd5d2b3c5cda16fef552256aed4e2ea0802a8450a08f308a92142112ff6dda
+
+zmm3 sha1:697aad7715a1e7306ca76290a3dd4208fbaeddfa
+zmm3 sha256:8b10fab49e9be3414aa5e9a93d0e46f9569053440138a7c19a5eb5536d8e95bf
+
+zmn1 sha1:b16d7b25b869f2beb124efa53467d8a1550ad694
+zmn1 sha256:609e4f75d1295e844c826feeba213acb0b6cfc609adfe8ff705b19e3829ae3e9
+
+zmn2 sha1:a5c544c21cfcb07eb80a4d89a5b7d1570002edfd
+zmn2 sha256:d6d03edf2dc1a3b267a8205de5f41a2ff4b03def8c7ae02052b543fb09d589fc
+
+zna1 sha1:d12979c22fff69c59ca9409e7a8fe3ee25eaee80
+zna1 sha256:b37b80e789e8ea32aa323f004628f02013f632124b0282c7fe00a127d3c64c3c
+
+znd1 sha1:a18393c636b98e9bd7296b8b437ea4992b72440c
+znd1 sha256:af92a22eee8c38410a0c9d2b5135a10aeb052cbc7cf675541ed9a67bfcaf7cf9
+
+znm1 sha1:3fdbe17fd013303a2e981e1ca1c6cd6e72789087
+znm1 sha256:f75aeaa0c11e76918e381c105f0752932c6150e941fec565d24fa31098a13dc1
+
+znm2 sha1:7e09d6a3a14bd630913e8c75693cea32157b606d
+znm2 sha256:938d73cfbaa1c902a84fb5b3afd9736aa0590367fb9bd59c6c4d072ce70fcd6d
+EOF
+
+cat >.test-plain-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 040000 $(test_oid zero) $(test_oid df_1) A DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT
+:040000 040000 $(test_oid z__1) $(test_oid z__2) M Z
EOF
-cat >.test-recursive-OA <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA
-:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 A DF/DF
-:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM
-:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM
-:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT
-:000000 100644 0000000000000000000000000000000000000000 8acb8e9750e3f644bf323fcf3d338849db106c77 A Z/AA
-:000000 100644 0000000000000000000000000000000000000000 087494262084cefee7ed484d20c8dc0580791272 A Z/AN
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD
-:100644 000000 9b541b2275c06e3a7b13f28badf5294e2ae63df4 0000000000000000000000000000000000000000 D Z/DM
-:100644 000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a 0000000000000000000000000000000000000000 D Z/DN
-:100644 100644 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 M Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 61422ba9c2c873416061a88cd40a59a35b576474 M Z/MM
-:100644 100644 b16d7b25b869f2beb124efa53467d8a1550ad694 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd M Z/MN
+cat >.test-recursive-OA <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA
+:000000 100644 $(test_oid zero) $(test_oid an_1) A AN
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid dfd1) A DF/DF
+:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM
+:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM
+:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT
+:000000 100644 $(test_oid zero) $(test_oid zaa1) A Z/AA
+:000000 100644 $(test_oid zero) $(test_oid zan1) A Z/AN
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD
+:100644 000000 $(test_oid zdm1) $(test_oid zero) D Z/DM
+:100644 000000 $(test_oid zdn1) $(test_oid zero) D Z/DN
+:100644 100644 $(test_oid zmd1) $(test_oid zmd2) M Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm2) M Z/MM
+:100644 100644 $(test_oid zmn1) $(test_oid zmn2) M Z/MN
EOF
-cat >.test-plain-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 1ba523955d5160681af65cb776411f574c1e8155 M Z
+cat >.test-plain-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT
+:040000 040000 $(test_oid z__1) $(test_oid z__3) M Z
EOF
-cat >.test-recursive-OB <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA
-:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM
-:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL
-:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD
-:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS
-:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:000000 100644 0000000000000000000000000000000000000000 6c0b99286d0bce551ac4a7b3dff8b706edff3715 A Z/AA
-:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD
-:100644 100644 9b541b2275c06e3a7b13f28badf5294e2ae63df4 d77371d15817fcaa57eeec27f770c505ba974ec1 M Z/DM
-:100644 000000 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 0000000000000000000000000000000000000000 D Z/MD
-:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM
+cat >.test-recursive-OB <<EOF
+:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA
+:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM
+:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL
+:100644 000000 $(test_oid md_1) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS
+:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT
+:000000 100644 $(test_oid zero) $(test_oid zaa2) A Z/AA
+:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD
+:100644 100644 $(test_oid zdm1) $(test_oid zdm2) M Z/DM
+:100644 000000 $(test_oid zmd1) $(test_oid zero) D Z/MD
+:100644 100644 $(test_oid zmm1) $(test_oid zmm3) M Z/MM
+:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM
EOF
-cat >.test-plain-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:040000 000000 6d50f65d3bdab91c63444294d38f08aeff328e42 0000000000000000000000000000000000000000 D DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:040000 040000 5e5f22072bb39f6e12cf663a57cb634c76eefb49 1ba523955d5160681af65cb776411f574c1e8155 M Z
+cat >.test-plain-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:040000 000000 $(test_oid df_1) $(test_oid zero) D DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT
+:040000 040000 $(test_oid z__2) $(test_oid z__3) M Z
EOF
-cat >.test-recursive-AB <<\EOF
-:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA
-:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN
-:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF
-:100644 000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 0000000000000000000000000000000000000000 D DF/DF
-:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM
-:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN
-:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD
-:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM
-:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN
-:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA
-:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND
-:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM
-:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT
-:100644 100644 8acb8e9750e3f644bf323fcf3d338849db106c77 6c0b99286d0bce551ac4a7b3dff8b706edff3715 M Z/AA
-:100644 000000 087494262084cefee7ed484d20c8dc0580791272 0000000000000000000000000000000000000000 D Z/AN
-:000000 100644 0000000000000000000000000000000000000000 d77371d15817fcaa57eeec27f770c505ba974ec1 A Z/DM
-:000000 100644 0000000000000000000000000000000000000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a A Z/DN
-:100644 000000 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 0000000000000000000000000000000000000000 D Z/MD
-:100644 100644 61422ba9c2c873416061a88cd40a59a35b576474 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM
-:100644 100644 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd b16d7b25b869f2beb124efa53467d8a1550ad694 M Z/MN
-:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA
-:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND
-:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM
+cat >.test-recursive-AB <<EOF
+:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA
+:100644 000000 $(test_oid an_1) $(test_oid zero) D AN
+:000000 100644 $(test_oid zero) $(test_oid df_2) A DF
+:100644 000000 $(test_oid dfd1) $(test_oid zero) D DF/DF
+:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM
+:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN
+:100644 000000 $(test_oid md_2) $(test_oid zero) D MD
+:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM
+:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN
+:000000 100644 $(test_oid zero) $(test_oid na_1) A NA
+:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND
+:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM
+:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT
+:100644 100644 $(test_oid zaa1) $(test_oid zaa2) M Z/AA
+:100644 000000 $(test_oid zan1) $(test_oid zero) D Z/AN
+:000000 100644 $(test_oid zero) $(test_oid zdm2) A Z/DM
+:000000 100644 $(test_oid zero) $(test_oid zdn1) A Z/DN
+:100644 000000 $(test_oid zmd2) $(test_oid zero) D Z/MD
+:100644 100644 $(test_oid zmm2) $(test_oid zmm3) M Z/MM
+:100644 100644 $(test_oid zmn2) $(test_oid zmn1) M Z/MN
+:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA
+:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND
+:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM
EOF
cmp_diff_files_output () {
'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
+ orig=$(git hash-object COPYING) &&
tree=$(git write-tree) &&
echo $tree'
'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
rm -f COPYING &&
+ c1=$(git hash-object COPYING.1) &&
+ c2=$(git hash-object COPYING.2) &&
git update-index --add --remove COPYING COPYING.?'
# tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2,
git diff-index -z -C $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234
+:100644 100644 $orig $c2 R1234
COPYING
COPYING.2
EOF
# about rezrov.
git diff-index -z -C $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M
+cat >expected <<EOF
+:100644 100644 $orig $c2 M
COPYING
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
EOF
git update-index --add --remove COPYING COPYING.1'
git diff-index -z -C --find-copies-harder $tree >current
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234
+cat >expected <<EOF
+:100644 100644 $orig $c1 C1234
COPYING
COPYING.1
EOF
. ./test-lib.sh
-LF='
-'
-
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
. "$TEST_DIRECTORY"/lib-terminal.sh
test_expect_success setup '
-
for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
cat file >elif &&
git add file elif &&
git commit -m "Side changes #3 with \\n backslash-n in it." &&
git checkout master &&
- git diff-tree -p C2 | git apply --index &&
+ git diff-tree -p C2 >patch &&
+ git apply --index <patch &&
test_tick &&
- git commit -m "Master accepts moral equivalent of #2"
+ git commit -m "Master accepts moral equivalent of #2" &&
-'
+ git checkout side &&
+ git checkout -b patchid &&
+ for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file2 &&
+ for i in 1 2 3 A 4 B C 7 8 9 10 D E F 5 6; do echo "$i"; done >file3 &&
+ for i in 8 9 10; do echo "$i"; done >file &&
+ git add file file2 file3 &&
+ test_tick &&
+ git commit -m "patchid 1" &&
+ for i in 4 A B 7 8 9 10; do echo "$i"; done >file2 &&
+ for i in 8 9 10 5 6; do echo "$i"; done >file3 &&
+ git add file2 file3 &&
+ test_tick &&
+ git commit -m "patchid 2" &&
+ for i in 10 5 6; do echo "$i"; done >file &&
+ git add file &&
+ test_tick &&
+ git commit -m "patchid 3" &&
-test_expect_success "format-patch --ignore-if-in-upstream" '
+ git checkout master
+'
+test_expect_success 'format-patch --ignore-if-in-upstream' '
git format-patch --stdout master..side >patch0 &&
- cnt=$(grep "^From " patch0 | wc -l) &&
- test $cnt = 3
-
+ grep "^From " patch0 >from0 &&
+ test_line_count = 3 from0
'
-test_expect_success "format-patch --ignore-if-in-upstream" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream' '
git format-patch --stdout \
--ignore-if-in-upstream master..side >patch1 &&
- cnt=$(grep "^From " patch1 | wc -l) &&
- test $cnt = 2
-
+ grep "^From " patch1 >from1 &&
+ test_line_count = 2 from1
'
-test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
+test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
git tag -a v1 -m tag side &&
git tag -a v2 -m tag master &&
git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
- cnt=$(grep "^From " patch1 | wc -l) &&
- test $cnt = 2
+ grep "^From " patch1 >from1 &&
+ test_line_count = 2 from1
'
test_expect_success "format-patch doesn't consider merge commits" '
-
git checkout -b slave master &&
echo "Another line" >>file &&
test_tick &&
git checkout -b merger master &&
test_tick &&
git merge --no-ff slave &&
- cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) &&
- test $cnt = 3
+ git format-patch -3 --stdout >patch &&
+ grep "^From " patch >from &&
+ test_line_count = 3 from
'
-test_expect_success "format-patch result applies" '
-
+test_expect_success 'format-patch result applies' '
git checkout -b rebuild-0 master &&
git am -3 patch0 &&
- cnt=$(git rev-list master.. | wc -l) &&
- test $cnt = 2
+ git rev-list master.. >list &&
+ test_line_count = 2 list
'
-test_expect_success "format-patch --ignore-if-in-upstream result applies" '
-
+test_expect_success 'format-patch --ignore-if-in-upstream result applies' '
git checkout -b rebuild-1 master &&
git am -3 patch1 &&
- cnt=$(git rev-list master.. | wc -l) &&
- test $cnt = 2
+ git rev-list master.. >list &&
+ test_line_count = 2 list
'
test_expect_success 'commit did not screw up the log message' '
-
- git cat-file commit side | grep "^Side .* with .* backslash-n"
-
+ git cat-file commit side >actual &&
+ grep "^Side .* with .* backslash-n" actual
'
test_expect_success 'format-patch did not screw up the log message' '
-
grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
-
'
test_expect_success 'replay did not screw up the log message' '
-
- git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
-
+ git cat-file commit rebuild-1 >actual &&
+ grep "^Side .* with .* backslash-n" actual
'
test_expect_success 'extra headers' '
-
git config format.headers "To: R E Cipient <rcipient@example.com>
" &&
git config --add format.headers "Cc: S E Cipient <scipient@example.com>
" &&
- git format-patch --stdout master..side > patch2 &&
- sed -e "/^\$/q" patch2 > hdrs2 &&
+ git format-patch --stdout master..side >patch2 &&
+ sed -e "/^\$/q" patch2 >hdrs2 &&
grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
-
'
test_expect_success 'extra headers without newlines' '
-
git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
git format-patch --stdout master..side >patch3 &&
- sed -e "/^\$/q" patch3 > hdrs3 &&
+ sed -e "/^\$/q" patch3 >hdrs3 &&
grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
-
'
test_expect_success 'extra headers with multiple To:s' '
-
git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
- git format-patch --stdout master..side > patch4 &&
- sed -e "/^\$/q" patch4 > hdrs4 &&
+ git format-patch --stdout master..side >patch4 &&
+ sed -e "/^\$/q" patch4 >hdrs4 &&
grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
'
test_expect_success 'additional command line cc (ascii)' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
- grep "^ *S E Cipient <scipient@example.com>\$" patch5
+ git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ sed -e "/^\$/q" patch5 >hdrs5 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+ grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
'
test_expect_failure 'additional command line cc (rfc822)' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
- grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5
+ git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ sed -e "/^\$/q" patch5 >hdrs5 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+ grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
'
test_expect_success 'command line headers' '
-
git config --unset-all format.headers &&
- git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 &&
- grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6
+ git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 &&
+ sed -e "/^\$/q" patch6 >hdrs6 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
'
test_expect_success 'configuration headers and command line headers' '
-
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 &&
- grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 &&
- grep "^ *S E Cipient <scipient@example.com>\$" patch7
+ git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side >patch7 &&
+ sed -e "/^\$/q" patch7 >hdrs7 &&
+ grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
+ grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
'
test_expect_success 'command line To: header (ascii)' '
-
git config --unset-all format.headers &&
- git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: R E Cipient <rcipient@example.com>\$" patch8
+ git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
'
test_expect_failure 'command line To: header (rfc822)' '
-
- git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
+ git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
'
test_expect_failure 'command line To: header (rfc2047)' '
-
- git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
+ git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ sed -e "/^\$/q" patch8 >hdrs8 &&
+ grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
'
test_expect_success 'configuration To: header (ascii)' '
-
git config format.to "R E Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: R E Cipient <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
'
test_expect_failure 'configuration To: header (rfc822)' '
-
git config format.to "R. E. Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
'
test_expect_failure 'configuration To: header (rfc2047)' '
-
git config format.to "R Ä Cipient <rcipient@example.com>" &&
- git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
+ git format-patch --stdout master..side >patch9 &&
+ sed -e "/^\$/q" patch9 >hdrs9 &&
+ grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
'
# check_patch <patch>: Verify that <patch> looks like a half-sane
}
test_expect_success 'format.from=false' '
-
- git -c format.from=false format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
+ git -c format.from=false format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
check_patch patch &&
- ! grep "^From: C O Mitter <committer@example.com>\$" patch
+ ! grep "^From: C O Mitter <committer@example.com>\$" hdrs
'
test_expect_success 'format.from=true' '
-
- git -c format.from=true format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- grep "^From: C O Mitter <committer@example.com>\$" patch
+ git -c format.from=true format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ grep "^From: C O Mitter <committer@example.com>\$" hdrs
'
test_expect_success 'format.from with address' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--no-from overrides format.from' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- ! grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ ! grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--from overrides format.from' '
-
- git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
- sed -e "/^\$/q" >patch &&
- check_patch patch &&
- ! grep "^From: F R Om <from@example.com>\$" patch
+ git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side >patch &&
+ sed -e "/^\$/q" patch >hdrs &&
+ check_patch hdrs &&
+ ! grep "^From: F R Om <from@example.com>\$" hdrs
'
test_expect_success '--no-to overrides config.to' '
-
git config --replace-all format.to \
"R E Cipient <rcipient@example.com>" &&
- git format-patch --no-to --stdout master..side |
- sed -e "/^\$/q" >patch10 &&
- check_patch patch10 &&
- ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10
+ git format-patch --no-to --stdout master..side >patch10 &&
+ sed -e "/^\$/q" patch10 >hdrs10 &&
+ check_patch hdrs10 &&
+ ! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
'
test_expect_success '--no-to and --to replaces config.to' '
-
git config --replace-all format.to \
"Someone <someone@out.there>" &&
git format-patch --no-to --to="Someone Else <else@out.there>" \
- --stdout master..side |
- sed -e "/^\$/q" >patch11 &&
- check_patch patch11 &&
- ! grep "^To: Someone <someone@out.there>\$" patch11 &&
- grep "^To: Someone Else <else@out.there>\$" patch11
+ --stdout master..side >patch11 &&
+ sed -e "/^\$/q" patch11 >hdrs11 &&
+ check_patch hdrs11 &&
+ ! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
+ grep "^To: Someone Else <else@out.there>\$" hdrs11
'
test_expect_success '--no-cc overrides config.cc' '
-
git config --replace-all format.cc \
"C E Cipient <rcipient@example.com>" &&
- git format-patch --no-cc --stdout master..side |
- sed -e "/^\$/q" >patch12 &&
- check_patch patch12 &&
- ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12
+ git format-patch --no-cc --stdout master..side >patch12 &&
+ sed -e "/^\$/q" patch12 >hdrs12 &&
+ check_patch hdrs12 &&
+ ! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
'
test_expect_success '--no-add-header overrides config.headers' '
-
git config --replace-all format.headers \
"Header1: B E Cipient <rcipient@example.com>" &&
- git format-patch --no-add-header --stdout master..side |
- sed -e "/^\$/q" >patch13 &&
- check_patch patch13 &&
- ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13
+ git format-patch --no-add-header --stdout master..side >patch13 &&
+ sed -e "/^\$/q" patch13 >hdrs13 &&
+ check_patch hdrs13 &&
+ ! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
'
test_expect_success 'multiple files' '
-
rm -rf patches/ &&
git checkout side &&
git format-patch -o patches/ master &&
check_threading () {
expect="$1" &&
shift &&
- (git format-patch --stdout "$@"; echo $? > status.out) |
+ git format-patch --stdout "$@" >patch &&
# Prints everything between the Message-ID and In-Reply-To,
# and replaces all Message-ID-lookalikes by a sequence number
perl -ne '
print;
}
print "---\n" if /^From /i;
- ' > actual &&
- test 0 = "$(cat status.out)" &&
+ ' <patch >actual &&
test_cmp "$expect" actual
}
-cat >> expect.no-threading <<EOF
+cat >>expect.no-threading <<EOF
---
---
---
check_threading expect.no-threading master
'
-cat > expect.thread <<EOF
+cat >expect.thread <<EOF
---
Message-Id: <0>
---
check_threading expect.thread --thread master
'
-cat > expect.in-reply-to <<EOF
+cat >expect.in-reply-to <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
--thread master
'
-cat > expect.cover-letter <<EOF
+cat >expect.cover-letter <<EOF
---
Message-Id: <0>
---
check_threading expect.cover-letter --cover-letter --thread master
'
-cat > expect.cl-irt <<EOF
+cat >expect.cl-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
--in-reply-to="<test.message>" --thread=shallow master
'
-cat > expect.deep <<EOF
+cat >expect.deep <<EOF
---
Message-Id: <0>
---
check_threading expect.deep --thread=deep master
'
-cat > expect.deep-irt <<EOF
+cat >expect.deep-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
--in-reply-to="<test.message>" master
'
-cat > expect.deep-cl <<EOF
+cat >expect.deep-cl <<EOF
---
Message-Id: <0>
---
check_threading expect.deep-cl --cover-letter --thread=deep master
'
-cat > expect.deep-cl-irt <<EOF
+cat >expect.deep-cl-irt <<EOF
---
Message-Id: <0>
In-Reply-To: <1>
'
test_expect_success 'excessive subject' '
-
rm -rf patches/ &&
git checkout side &&
before=$(git hash-object file) &&
! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
git format-patch --cover-letter -1 -M &&
grep "file => foo .* 0 *\$" 0000-cover-letter.patch
-
'
-cat > expect << EOF
+cat >expect <<EOF
This is an excessively long subject line for a message due to the
habit some projects have of not having a short, one-line subject at
the start of the commit message, but rather sticking a whole
EOF
test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
-
git format-patch --cover-letter -2 &&
- sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output &&
+ sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
test_cmp expect output
-
'
-cat > expect << EOF
+cat >expect <<EOF
index $before..$after 100644
--- a/file
+++ b/file
EOF
test_expect_success 'format-patch respects -U' '
-
git format-patch -U4 -2 &&
sed -e "1,/^diff/d" -e "/^+5/q" \
<0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
>output &&
test_cmp expect output
-
'
-cat > expect << EOF
+cat >expect <<EOF
diff --git a/file b/file
index $before..$after 100644
EOF
test_expect_success 'format-patch -p suppresses stat' '
-
git format-patch -p -2 &&
- sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
+ sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
test_cmp expect output
-
'
test_expect_success 'format-patch from a subdirectory (1)' '
'
test_expect_success 'format-patch --in-reply-to' '
- git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
+ git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 &&
grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
grep "^References: <baz@foo.bar>" patch8
'
sed "1,/^---$/d" out | grep "test message"
'
-echo "fatal: --name-only does not make sense" > expect.name-only
-echo "fatal: --name-status does not make sense" > expect.name-status
-echo "fatal: --check does not make sense" > expect.check
+test_expect_success 'format-patch notes output control' '
+ git notes add -m "notes config message" HEAD &&
+ test_when_finished git notes remove HEAD &&
+
+ git format-patch -1 --stdout >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes --notes >out &&
+ grep "notes config message" out &&
+
+ test_config format.notes true &&
+ git format-patch -1 --stdout >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --notes >out &&
+ grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --notes --no-notes >out &&
+ ! grep "notes config message" out &&
+ git format-patch -1 --stdout --no-notes --notes >out &&
+ grep "notes config message" out
+'
+
+test_expect_success 'format-patch with multiple notes refs' '
+ git notes --ref note1 add -m "this is note 1" HEAD &&
+ test_when_finished git notes --ref note1 remove HEAD &&
+ git notes --ref note2 add -m "this is note 2" HEAD &&
+ test_when_finished git notes --ref note2 remove HEAD &&
+
+ git format-patch -1 --stdout >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note1 >out &&
+ grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note2 >out &&
+ ! grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note1 --notes=note2 >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+
+ test_config format.notes note1 &&
+ git format-patch -1 --stdout >out &&
+ grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out &&
+ git format-patch -1 --stdout --notes=note2 >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes --notes=note2 >out &&
+ ! grep "this is note 1" out &&
+ grep "this is note 2" out &&
+
+ git config --add format.notes note2 &&
+ git format-patch -1 --stdout >out &&
+ grep "this is note 1" out &&
+ grep "this is note 2" out &&
+ git format-patch -1 --stdout --no-notes >out &&
+ ! grep "this is note 1" out &&
+ ! grep "this is note 2" out
+'
+
+echo "fatal: --name-only does not make sense" >expect.name-only
+echo "fatal: --name-status does not make sense" >expect.name-status
+echo "fatal: --check does not make sense" >expect.check
test_expect_success 'options no longer allowed for format-patch' '
- test_must_fail git format-patch --name-only 2> output &&
+ test_must_fail git format-patch --name-only 2>output &&
test_i18ncmp expect.name-only output &&
- test_must_fail git format-patch --name-status 2> output &&
+ test_must_fail git format-patch --name-status 2>output &&
test_i18ncmp expect.name-status output &&
- test_must_fail git format-patch --check 2> output &&
- test_i18ncmp expect.check output'
+ test_must_fail git format-patch --check 2>output &&
+ test_i18ncmp expect.check output
+'
test_expect_success 'format-patch --numstat should produce a patch' '
- git format-patch --numstat --stdout master..side > output &&
- test 5 = $(grep "^diff --git a/" output | wc -l)'
+ git format-patch --numstat --stdout master..side >output &&
+ grep "^diff --git a/" output >diff &&
+ test_line_count = 5 diff
+'
test_expect_success 'format-patch -- <path>' '
git format-patch master..side -- file 2>error &&
git format-patch --ignore-if-in-upstream HEAD
'
-git_version="$(git --version | sed "s/.* //")"
+test_expect_success 'get git version' '
+ git_version=$(git --version) &&
+ git_version=${git_version##* }
+'
signature() {
printf "%s\n%s\n\n" "-- " "${1:-$git_version}"
}
test_expect_success 'format-patch default signature' '
- git format-patch --stdout -1 | tail -n 3 >output &&
+ git format-patch --stdout -1 >patch &&
+ tail -n 3 patch >output &&
signature >expect &&
test_cmp expect output
'
test_expect_success 'format-patch --signature' '
- git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output &&
+ git format-patch --stdout --signature="my sig" -1 >patch &&
+ tail -n 3 patch >output &&
signature "my sig" >expect &&
test_cmp expect output
'
git config --unset-all format.signature &&
git format-patch --stdout --signature="my sig" --cover-letter \
-1 >output &&
- grep "my sig" output &&
- test 2 = $(grep "my sig" output | wc -l)
+ grep "my sig" output >sig &&
+ test_line_count = 2 sig
'
test_expect_success 'format.signature="" suppresses signatures' '
test_expect_success '--signature-file=file works' '
git format-patch --stdout --signature-file=mail-signature -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat mail-signature && echo
} >expect &&
test_config format.signaturefile mail-signature &&
git format-patch --stdout -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat mail-signature && echo
} >expect &&
git format-patch --stdout \
--signature-file=other-mail-signature -1 >output &&
check_patch output &&
- sed -e "1,/^-- \$/d" <output >actual &&
+ sed -e "1,/^-- \$/d" output >actual &&
{
cat other-mail-signature && echo
} >expect &&
git add file &&
git commit -m "$M512" &&
git format-patch --stdout -1 >patch &&
- sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+ sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
test_cmp expect subject
'
git add file &&
git commit -m "$M512" &&
git format-patch --stdout -1 >patch &&
- sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
+ sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
test_cmp expect subject
'
git add file &&
GIT_AUTHOR_NAME=$1 git commit -m author-check &&
git format-patch --stdout -1 >patch &&
- sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual &&
+ sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
test_cmp expect actual
}
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
From: A U Thor <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
From: éxötìc <author@example.com>
EOF
- sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head &&
+ sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
test_cmp expect patch.head
'
test_expect_success 'signoff: commit with no body' '
append_signoff </dev/null >actual &&
- cat <<\EOF | sed "s/EOL$//" >expected &&
-4:Subject: [PATCH] EOL
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat <<-\EOF | sed "s/EOL$//" >expect &&
+ 4:Subject: [PATCH] EOL
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: commit with only subject' '
echo subject | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: commit with only subject that does not end with NL' '
printf subject | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: no existing signoffs' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ body
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: no existing signoffs and no trailing NL' '
printf "subject\n\nbody" | append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: some random signoff' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: my@house
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: misc conforming footer elements' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: my@house
-(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
-Tested-by: Some One <someone@example.com>
-Bug: 1234
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: my@house
-15:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: my@house
+ (cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
+ Tested-by: Some One <someone@example.com>
+ Bug: 1234
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: my@house
+ 15:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: some random signoff-alike' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
-Fooled-by-me: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ body
+ Fooled-by-me: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: not really a signoff' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-I want to mention about Signed-off-by: here.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:I want to mention about Signed-off-by: here.
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ I want to mention about Signed-off-by: here.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:I want to mention about Signed-off-by: here.
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: not really a signoff (2)' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-My unfortunate
-Signed-off-by: example happens to be wrapped here.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:Signed-off-by: example happens to be wrapped here.
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ My unfortunate
+ Signed-off-by: example happens to be wrapped here.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:Signed-off-by: example happens to be wrapped here.
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: valid S-o-b paragraph in the middle' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Signed-off-by: my@house
-Signed-off-by: your@house
+ Signed-off-by: my@house
+ Signed-off-by: your@house
-A lot of houses.
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: my@house
-10:Signed-off-by: your@house
-11:
-13:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ A lot of houses.
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: my@house
+ 10:Signed-off-by: your@house
+ 11:
+ 13:
+ 14:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff at the end' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff at the end, no trailing NL' '
printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
append_signoff >actual &&
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-9:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 9:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: the same signoff NOT at the end' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Signed-off-by: C O Mitter <committer@example.com>
-Signed-off-by: my@house
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-11:Signed-off-by: C O Mitter <committer@example.com>
-12:Signed-off-by: my@house
-EOF
- test_cmp expected actual
+ Signed-off-by: C O Mitter <committer@example.com>
+ Signed-off-by: my@house
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ 12:Signed-off-by: my@house
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: tolerate garbage in conforming footer' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Tested-by: my@house
-Some Trash
-Signed-off-by: C O Mitter <committer@example.com>
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-13:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Tested-by: my@house
+ Some Trash
+ Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 13:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: respect trailer config' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Myfooter: x
-Some Trash
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:
-12:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual &&
+ Myfooter: x
+ Some Trash
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:
+ 12:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual &&
test_config trailer.Myfooter.ifexists add &&
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-Myfooter: x
-Some Trash
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-11:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Myfooter: x
+ Some Trash
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 11:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'signoff: footer begins with non-signoff without @ sign' '
- append_signoff <<\EOF >actual &&
-subject
+ append_signoff <<-\EOF >actual &&
+ subject
-body
+ body
-Reviewed-id: Noone
-Tested-by: my@house
-Change-id: Ideadbeef
-Signed-off-by: C O Mitter <committer@example.com>
-Bug: 1234
-EOF
- cat >expected <<\EOF &&
-4:Subject: [PATCH] subject
-8:
-10:
-14:Signed-off-by: C O Mitter <committer@example.com>
-EOF
- test_cmp expected actual
+ Reviewed-id: Noone
+ Tested-by: my@house
+ Change-id: Ideadbeef
+ Signed-off-by: C O Mitter <committer@example.com>
+ Bug: 1234
+ EOF
+ cat >expect <<-\EOF &&
+ 4:Subject: [PATCH] subject
+ 8:
+ 10:
+ 14:Signed-off-by: C O Mitter <committer@example.com>
+ EOF
+ test_cmp expect actual
'
test_expect_success 'format patch ignores color.ui' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter master >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (2)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (3)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter ^master rebuild-1 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (4)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter master.. >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (5)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter -2 HEAD >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter using branch description (6)' '
git checkout rebuild-1 &&
test_config branch.rebuild-1.description hello &&
git format-patch --stdout --cover-letter -2 >actual &&
- grep hello actual >/dev/null
+ grep hello actual
'
test_expect_success 'cover letter with nothing' '
test_config format.outputDirectory patches &&
rm -fr patches &&
git format-patch master..side &&
- test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l)
+ git rev-list master..side >list &&
+ test_line_count = $(ls patches | wc -l) list
'
test_expect_success 'format-patch -o overrides format.outputDirectory' '
'
test_expect_success 'format-patch --base' '
- git checkout side &&
- git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 &&
- git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 &&
- echo >expected &&
- echo "base-commit: $(git rev-parse HEAD~3)" >>expected &&
- echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected &&
- echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected &&
- signature >> expected &&
- test_cmp expected actual1 &&
- test_cmp expected actual2
+ git checkout patchid &&
+
+ git format-patch --stdout --base=HEAD~3 -1 >patch &&
+ tail -n 7 patch >actual1 &&
+
+ git format-patch --stdout --base=HEAD~3 HEAD~.. >patch &&
+ tail -n 7 patch >actual2 &&
+
+ echo >expect &&
+ git rev-parse HEAD~3 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >>expect &&
+
+ git show --patch HEAD~2 >patch &&
+ git patch-id --stable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+ git show --patch HEAD~1 >patch &&
+ git patch-id --stable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+
+ signature >>expect &&
+ test_cmp expect actual1 &&
+ test_cmp expect actual2 &&
+
+ echo >fail &&
+ echo "base-commit: $(cat commit-id-base)" >>fail &&
+
+ git show --patch HEAD~2 >patch &&
+ git patch-id --unstable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+ git show --patch HEAD~1 >patch &&
+ git patch-id --unstable <patch >patch.id.raw &&
+ awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+
+ signature >>fail &&
+ ! test_cmp fail actual1 &&
+ ! test_cmp fail actual2
'
test_expect_success 'format-patch --base errors out when base commit is in revision list' '
test_must_fail git format-patch --base=HEAD~1 -2 &&
git format-patch --stdout --base=HEAD~2 -2 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse HEAD~2)" >expected &&
- test_cmp expected actual
+ git rev-parse HEAD~2 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' '
test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(cat commit-id-base)" >expected &&
- test_cmp expected actual
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base=auto' '
test_commit N2 &&
git format-patch --stdout --base=auto -2 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse upstream)" >expected &&
- test_cmp expected actual
+ git rev-parse upstream >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch errors out when history involves criss-cross' '
git config format.useAutoBase true &&
git format-patch --stdout -1 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse upstream)" >expected &&
- test_cmp expected actual
+ git rev-parse upstream >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base overrides format.useAutoBase' '
git config format.useAutoBase true &&
git format-patch --stdout --base=HEAD~1 -1 >patch &&
grep "^base-commit:" patch >actual &&
- echo "base-commit: $(git rev-parse HEAD~1)" >expected &&
- test_cmp expected actual
+ git rev-parse HEAD~1 >commit-id-base &&
+ echo "base-commit: $(cat commit-id-base)" >expect &&
+ test_cmp expect actual
'
test_expect_success 'format-patch --base with --attach' '
git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch &&
test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch &&
- sed "1,/^@@ /d; /^-- $/q" <0000-cover-letter.patch >actual &&
+ sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
test_cmp expect actual
'
EOF
git format-patch --interdiff=boop~2 -1 boop &&
test_i18ngrep "^Interdiff:$" 0001-fleep.patch &&
- sed "1,/^ @@ /d; /^$/q" <0001-fleep.patch >actual &&
+ sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual &&
test_cmp expect actual
'
cpp
csharp
css
+ dts
fortran
fountain
golang
php
python
ruby
+ rust
tex
custom1
custom2
--- /dev/null
+/ {
+ label_1: node1@ff00 {
+ label2: RIGHT {
+ vendor,some-property;
+
+ ChangeMe = <0x45-30>;
+ };
+ };
+};
--- /dev/null
+/ {
+ label_1: node1 {
+ RIGHT {
+ prop-array = <1>, <4>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
--- /dev/null
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 {
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
--- /dev/null
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 /* &a comment */ {
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
--- /dev/null
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 { /* a trailing comment */
+ #size-cells = <1>;
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
--- /dev/null
+&label_1 {
+ TEST = <455>;
+};
+
+&RIGHT {
+ vendor,some-property;
+
+ ChangeMe = <0x45-30>;
+};
--- /dev/null
+/RIGHT { /* Technically just supposed to be a slash */
+ #size-cells = <1>;
+
+ ChangeMe = <0xffeedd00>;
+};
--- /dev/null
+classdef RIGHT
+ properties
+ ChangeMe
+ end
+end
--- /dev/null
+function y = RIGHT()
+x = 5;
+y = ChangeMe + x;
+end
--- /dev/null
+%%% RIGHT section
+# this is octave script
+ChangeMe = 1;
--- /dev/null
+## RIGHT section
+# this is octave script
+ChangeMe = 1;
--- /dev/null
+%% RIGHT section
+% this is understood by both matlab and octave
+ChangeMe = 1;
--- /dev/null
+pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
+ let _ = x;
+ // a comment
+ let a = ChangeMe;
+}
--- /dev/null
+impl<'a, T: AsRef<[u8]>> std::RIGHT for Git<'a> {
+
+ pub fn ChangeMe(&self) -> () {
+ }
+}
--- /dev/null
+#[derive(Debug)]
+pub(super) struct RIGHT<'a> {
+ name: &'a str,
+ age: ChangeMe,
+}
--- /dev/null
+unsafe trait RIGHT<T> {
+ fn len(&self) -> u32;
+ fn ChangeMe(&self, n: u32) -> T;
+ fn iter<F>(&self, f: F) where F: Fn(T);
+}
test_language_driver cpp
test_language_driver csharp
test_language_driver css
+test_language_driver dts
test_language_driver fortran
test_language_driver html
test_language_driver java
--- /dev/null
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index b6a9051..7803aee 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,32 +1,32 @@<RESET>
+/ {<RESET>
+ <RED>this_handle<RESET><GREEN>HANDLE_2<RESET>: <RED>node<RESET><GREEN>new-node<RESET>@<RED>f00<RESET><GREEN>eeda<RESET> {
+ compatible = "<RED>mydev<RESET><GREEN>vendor,compat<RESET>";
+ string-prop = <RED>start<RESET><GREEN>end<RESET>: "hello <RED>world!<RESET><GREEN>world?<RESET>" <RED>end<RESET><GREEN>start<RESET>: ;
+ <RED>#size-cells<RESET><GREEN>#address-cells<RESET> = <<RED>0+0<RESET><GREEN>0+40<RESET>>;
+ reg = <<RED>0xf00<RESET><GREEN>0xeeda<RESET>>;
+ prop = <<GREEN>(<RESET>1<GREEN>)<RESET>>;
+ prop = <<GREEN>(<RESET>-1e10<GREEN>)<RESET>>;
+ prop = <(!<RED>3<RESET><GREEN>1<RESET>)>;
+ prop = <(~<RED>3<RESET><GREEN>1<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>/<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>%<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3+4<RESET><GREEN>1+2<RESET>)>;
+ prop = <(<RED>3-4<RESET><GREEN>1-2<RESET>)>;
+ prop = /bits/ <RED>64<RESET><GREEN>32<RESET> <(<RED>3<RESET><GREEN>1<RESET><<<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>>><RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>^<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>|<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>&&<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>3<RESET><GREEN>1<RESET>||<RED>4<RESET><GREEN>2<RESET>)>;
+ prop = <(<RED>4?5<RESET><GREEN>1?2<RESET>:3)>;
+ list = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>, <0 0 0 <RED>0<RESET><GREEN>1<RESET>>;
+ };<RESET>
+
+ &<RED>phandle<RESET><GREEN>phandle2<RESET> {
+ <RED>pre-phandle<RESET><GREEN>prop_handle<RESET> = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>;
+ };<RESET>
+};<RESET>
--- /dev/null
+/ {
+ HANDLE_2: new-node@eeda {
+ compatible = "vendor,compat";
+ string-prop = end: "hello world?" start: ;
+ #address-cells = <0+40>;
+ reg = <0xeeda>;
+ prop = <(1)>;
+ prop = <(-1e10)>;
+ prop = <(!1)>;
+ prop = <(~1)>;
+ prop = <(1*2)>;
+ prop = <(1&2)>;
+ prop = <(1*2)>;
+ prop = <(1/2)>;
+ prop = <(1%2)>;
+ prop = <(1+2)>;
+ prop = <(1-2)>;
+ prop = /bits/ 32 <(1<<2)>;
+ prop = <(1>>2)>;
+ prop = <(1&2)>;
+ prop = <(1^2)>;
+ prop = <(1|2)>;
+ prop = <(1&&2)>;
+ prop = <(1||2)>;
+ prop = <(1?2:3)>;
+ list = <&HANDLE_2>, <0 0 0 1>;
+ };
+
+ &phandle2 {
+ prop_handle = <&HANDLE_2>;
+ };
+};
--- /dev/null
+/ {
+ this_handle: node@f00 {
+ compatible = "mydev";
+ string-prop = start: "hello world!" end: ;
+ #size-cells = <0+0>;
+ reg = <0xf00>;
+ prop = <1>;
+ prop = <-1e10>;
+ prop = <(!3)>;
+ prop = <(~3)>;
+ prop = <(3*4)>;
+ prop = <(3&4)>;
+ prop = <(3*4)>;
+ prop = <(3/4)>;
+ prop = <(3%4)>;
+ prop = <(3+4)>;
+ prop = <(3-4)>;
+ prop = /bits/ 64 <(3<<4)>;
+ prop = <(3>>4)>;
+ prop = <(3&4)>;
+ prop = <(3^4)>;
+ prop = <(3|4)>;
+ prop = <(3&&4)>;
+ prop = <(3||4)>;
+ prop = <(4?5:3)>;
+ list = <&this_handle>, <0 0 0 0>;
+ };
+
+ &phandle {
+ pre-phandle = <&this_handle>;
+ };
+};
! grep "want $(cat hash-b)" trace
'
+test_expect_success 'when fetching missing objects, diff skips GITLINKs' '
+ test_when_finished "rm -rf sub server client trace" &&
+
+ test_create_repo sub &&
+ test_commit -C sub first &&
+
+ test_create_repo server &&
+ echo a >server/a &&
+ git -C server add a &&
+ git -C server submodule add "file://$(pwd)/sub" &&
+ git -C server commit -m x &&
+
+ test_commit -C server/sub second &&
+ echo another-a >server/a &&
+ git -C server add a sub &&
+ git -C server commit -m x &&
+
+ test_config -C server uploadpack.allowfilter 1 &&
+ test_config -C server uploadpack.allowanysha1inwant 1 &&
+ git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+ echo a | git hash-object --stdin >hash-old-a &&
+ echo another-a | git hash-object --stdin >hash-new-a &&
+
+ # Ensure that a and another-a are fetched, and check (by successful
+ # execution of the diff) that no invalid OIDs are sent.
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+ grep "want $(cat hash-old-a)" trace &&
+ grep "want $(cat hash-new-a)" trace
+'
+
test_expect_success 'diff with rename detection batches blobs' '
test_when_finished "rm -rf server client trace" &&
test_cmp expected actual
'
+test_expect_success 'am and .gitattibutes' '
+ test_create_repo attributes &&
+ (
+ cd attributes &&
+ test_commit init &&
+ git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
+ git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
+
+ test_commit second &&
+ git checkout -b test HEAD^ &&
+
+ echo "*.txt filter=test conflict-marker-size=10" >.gitattributes &&
+ git add .gitattributes &&
+ test_commit third &&
+
+ echo "This text is smudged." >a.txt &&
+ git add a.txt &&
+ test_commit fourth &&
+
+ git checkout -b removal HEAD^ &&
+ git rm .gitattributes &&
+ git add -u &&
+ test_commit fifth &&
+ git cherry-pick test &&
+
+ git checkout -b conflict third &&
+ echo "This text is different." >a.txt &&
+ git add a.txt &&
+ test_commit sixth &&
+
+ git checkout test &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard master &&
+ git am patches &&
+ grep "smudged" a.txt &&
+
+ git checkout removal &&
+ git reset --hard &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard master &&
+ git am patches &&
+ grep "clean" a.txt &&
+
+ git checkout conflict &&
+ git reset --hard &&
+ git format-patch --stdout master..HEAD >patches &&
+ git reset --hard fourth &&
+ test_must_fail git am -3 patches &&
+ grep "<<<<<<<<<<" a.txt
+ )
+'
+
test_done
test_cmp expect actual
'
-test_expect_success 'log with various grep.patternType configurations & command-lines' '
+test_expect_success !FAIL_PREREQS 'log with various grep.patternType configurations & command-lines' '
git init pattern-type &&
(
cd pattern-type &&
test_must_fail git log --exclude-promisor-objects source-a
'
+test_expect_success 'log --end-of-options' '
+ git update-ref refs/heads/--source HEAD &&
+ git log --end-of-options --source >actual &&
+ git log >expect &&
+ test_cmp expect actual
+'
+
test_done
test_cmp expect actual
'
+test_expect_success 'log.mailmap=false disables mailmap' '
+ cat >expect <<-\EOF &&
+ Author: CTO <cto@coompany.xx>
+ Author: claus <me@company.xx>
+ Author: santa <me@company.xx>
+ Author: nick2 <nick2@company.xx>
+ Author: nick2 <bugs@company.xx>
+ Author: nick1 <bugs@company.xx>
+ Author: A U Thor <author@example.com>
+ EOF
+ git -c log.mailmap=False log | grep Author > actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--no-use-mailmap disables mailmap' '
+ cat >expect <<-\EOF &&
+ Author: CTO <cto@coompany.xx>
+ Author: claus <me@company.xx>
+ Author: santa <me@company.xx>
+ Author: nick2 <nick2@company.xx>
+ Author: nick2 <bugs@company.xx>
+ Author: nick1 <bugs@company.xx>
+ Author: A U Thor <author@example.com>
+ EOF
+ git log --no-use-mailmap | grep Author > actual &&
+ test_cmp expect actual
+'
+
cat >expect <<\EOF
Author: Santa Claus <santa.claus@northpole.xx>
Author: Santa Claus <santa.claus@northpole.xx>
test_cmp expect actual
'
+test_expect_success 'log.mailmap is true by default these days' '
+ git log --author Santa | grep Author >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'Only grep replaced author with --use-mailmap' '
git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
test_must_be_empty actual
test_must_fail git log -L1,24:b.c --raw
'
+test_expect_success 'setup for checking fancy rename following' '
+ git checkout --orphan moves-start &&
+ git reset --hard &&
+
+ printf "%s\n" 12 13 14 15 b c d e >file-1 &&
+ printf "%s\n" 22 23 24 25 B C D E >file-2 &&
+ git add file-1 file-2 &&
+ test_tick &&
+ git commit -m "Add file-1 and file-2" &&
+ oid_add_f1_f2=$(git rev-parse --short HEAD) &&
+
+ git checkout -b moves-main &&
+ printf "%s\n" 11 12 13 14 15 b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on main" &&
+ oid_mod_f1_main=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 21 22 23 24 25 B C D E >file-2 &&
+ git commit -a -m "Modify file-2 on main #1" &&
+ oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
+
+ git mv file-1 renamed-1 &&
+ git commit -m "Rename file-1 to renamed-1 on main" &&
+
+ printf "%s\n" 11 12 13 14 15 b c d e f >renamed-1 &&
+ git commit -a -m "Modify renamed-1 on main" &&
+ oid_mod_r1_main=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 21 22 23 24 25 B C D E F >file-2 &&
+ git commit -a -m "Modify file-2 on main #2" &&
+ oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
+
+ git checkout -b moves-side moves-start &&
+ printf "%s\n" 12 13 14 15 16 b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on side #1" &&
+ oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 22 23 24 25 26 B C D E >file-2 &&
+ git commit -a -m "Modify file-2 on side" &&
+ oid_mod_f2_side=$(git rev-parse --short HEAD) &&
+
+ git mv file-2 renamed-2 &&
+ git commit -m "Rename file-2 to renamed-2 on side" &&
+
+ printf "%s\n" 12 13 14 15 16 a b c d e >file-1 &&
+ git commit -a -m "Modify file-1 on side #2" &&
+ oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
+
+ printf "%s\n" 22 23 24 25 26 A B C D E >renamed-2 &&
+ git commit -a -m "Modify renamed-2 on side" &&
+ oid_mod_r2_side=$(git rev-parse --short HEAD) &&
+
+ git checkout moves-main &&
+ git merge moves-side &&
+ oid_merge=$(git rev-parse --short HEAD)
+'
+
+test_expect_success 'fancy rename following #1' '
+ cat >expect <<-EOF &&
+ $oid_merge Merge branch '\''moves-side'\'' into moves-main
+ $oid_mod_f1_side_2 Modify file-1 on side #2
+ $oid_mod_f1_side_1 Modify file-1 on side #1
+ $oid_mod_r1_main Modify renamed-1 on main
+ $oid_mod_f1_main Modify file-1 on main
+ $oid_add_f1_f2 Add file-1 and file-2
+ EOF
+ git log -L1:renamed-1 --oneline --no-patch >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'fancy rename following #2' '
+ cat >expect <<-EOF &&
+ $oid_merge Merge branch '\''moves-side'\'' into moves-main
+ $oid_mod_r2_side Modify renamed-2 on side
+ $oid_mod_f2_side Modify file-2 on side
+ $oid_mod_f2_main_2 Modify file-2 on main #2
+ $oid_mod_f2_main_1 Modify file-2 on main #1
+ $oid_add_f1_f2 Add file-1 and file-2
+ EOF
+ git log -L1:renamed-2 --oneline --no-patch >actual &&
+ test_cmp expect actual
+'
+
test_done
'
}
+test_expect_success 'setup' '
+ test_oid_cache <<-EOF
+ obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
+ obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
+ EOF
+'
+
test_expect_success \
'populate workdir' \
'mkdir a &&
'
test_expect_success LONG_IS_64BIT 'set up repository with huge blob' '
- obj_d=19 &&
- obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
- obj=${obj_d}${obj_f} &&
- mkdir -p .git/objects/$obj_d &&
- cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
+ obj=$(test_oid obj) &&
+ path=$(test_oid_to_path $obj) &&
+ mkdir -p .git/objects/$(dirname $path) &&
+ cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
rm -f .git/index &&
git update-index --add --cacheinfo 100644,$obj,huge &&
git commit -m huge
grep $size big.lst
'
+build_tree() {
+ perl -e '
+ my $hash = $ARGV[0];
+ foreach my $order (2..6) {
+ $first = 10 ** $order;
+ foreach my $i (-13..-9) {
+ my $name = "a" x ($first + $i);
+ print "100644 blob $hash\t$name\n"
+ }
+ }
+ ' "$1"
+}
+
+test_expect_success 'tar archive with long paths' '
+ blob=$(echo foo | git hash-object -w --stdin) &&
+ tree=$(build_tree $blob | git mktree) &&
+ git archive -o long_paths.tar $tree
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='Test git update-server-info'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' 'test_commit file'
+
+test_expect_success 'create info/refs' '
+ git update-server-info &&
+ test_path_is_file .git/info/refs
+'
+
+test_expect_success 'modify and store mtime' '
+ test-tool chmtime =0 .git/info/refs &&
+ test-tool chmtime --get .git/info/refs >a
+'
+
+test_expect_success 'info/refs is not needlessly overwritten' '
+ git update-server-info &&
+ test-tool chmtime --get .git/info/refs >b &&
+ test_cmp a b
+'
+
+test_expect_success 'info/refs can be forced to update' '
+ git update-server-info -f &&
+ test-tool chmtime --get .git/info/refs >b &&
+ ! test_cmp a b
+'
+
+test_expect_success 'info/refs updates when changes are made' '
+ test-tool chmtime =0 .git/info/refs &&
+ test-tool chmtime --get .git/info/refs >b &&
+ test_cmp a b &&
+ git update-ref refs/heads/foo HEAD &&
+ git update-server-info &&
+ test-tool chmtime --get .git/info/refs >b &&
+ ! test_cmp a b
+'
+
+test_done
'
test_expect_success 'rev-list notices corruption (1)' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list HEAD
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
'
test_expect_success 'rev-list notices corruption (2)' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --objects HEAD
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
'
test_expect_success 'pack-objects notices corruption' '
}
test_expect_success 'setup repo with moderate-sized history' '
- for i in $(test_seq 1 10)
- do
- test_commit $i
- done &&
+ test_commit_bulk --id=file 100 &&
git checkout -b other HEAD~5 &&
- for i in $(test_seq 1 10)
- do
- test_commit side-$i
- done &&
+ test_commit_bulk --id=side 10 &&
git checkout master &&
bitmaptip=$(git rev-parse master) &&
blob=$(echo tagged-blob | git hash-object -w --stdin) &&
'
test_expect_success 'setup further non-bitmapped commits' '
- for i in $(test_seq 1 10)
- do
- test_commit further-$i
- done
+ test_commit_bulk --id=further 10
'
rev_list_tests 'partial bitmap'
test_expect_success 'write graph with no packs' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write --object-dir . &&
- test_path_is_file info/commit-graph
+ test_path_is_missing info/commit-graph
'
-test_expect_success 'close with correct error on bad input' '
+test_expect_success 'exit with correct error on bad input to --stdin-packs' '
cd "$TRASH_DIRECTORY/full" &&
echo doesnotexist >in &&
- { git commit-graph write --stdin-packs <in 2>stderr; ret=$?; } &&
- test "$ret" = 1 &&
+ test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr &&
test_i18ngrep "error adding pack" stderr
'
git repack
'
+test_expect_success 'exit with correct error on bad input to --stdin-commits' '
+ cd "$TRASH_DIRECTORY/full" &&
+ echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+ test_i18ngrep "invalid commit object id" stderr &&
+ # valid tree OID, but not a commit OID
+ git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+ test_i18ngrep "invalid commit object id" stderr
+'
+
graph_git_two_modes() {
git -c core.commitGraph=true $1 >output
git -c core.commitGraph=false $1 >expect
"incorrect object offset"
'
+test_expect_success 'setup expire tests' '
+ mkdir dup &&
+ (
+ cd dup &&
+ git init &&
+ test-tool genrandom "data" 4096 >large_file.txt &&
+ git update-index --add large_file.txt &&
+ for i in $(test_seq 1 20)
+ do
+ test_commit $i
+ done &&
+ git branch A HEAD &&
+ git branch B HEAD~8 &&
+ git branch C HEAD~13 &&
+ git branch D HEAD~16 &&
+ git branch E HEAD~18 &&
+ git pack-objects --revs .git/objects/pack/pack-A <<-EOF &&
+ refs/heads/A
+ ^refs/heads/B
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-B <<-EOF &&
+ refs/heads/B
+ ^refs/heads/C
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-C <<-EOF &&
+ refs/heads/C
+ ^refs/heads/D
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-D <<-EOF &&
+ refs/heads/D
+ ^refs/heads/E
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-E <<-EOF &&
+ refs/heads/E
+ EOF
+ git multi-pack-index write &&
+ cp -r .git/objects/pack .git/objects/pack-backup
+ )
+'
+
+test_expect_success 'expire does not remove any packs' '
+ (
+ cd dup &&
+ ls .git/objects/pack >expect &&
+ git multi-pack-index expire &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'expire removes unreferenced packs' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/A
+ ^refs/heads/C
+ EOF
+ git multi-pack-index write &&
+ ls .git/objects/pack | grep -v -e pack-[AB] >expect &&
+ git multi-pack-index expire &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual &&
+ ls .git/objects/pack/ | grep idx >expect-idx &&
+ test-tool read-midx .git/objects | grep idx >actual-midx &&
+ test_cmp expect-idx actual-midx &&
+ git multi-pack-index verify &&
+ git fsck
+ )
+'
+
+test_expect_success 'repack with minimum size does not alter existing packs' '
+ (
+ cd dup &&
+ rm -rf .git/objects/pack &&
+ mv .git/objects/pack-backup .git/objects/pack &&
+ touch -m -t 201901010000 .git/objects/pack/pack-D* &&
+ touch -m -t 201901010001 .git/objects/pack/pack-C* &&
+ touch -m -t 201901010002 .git/objects/pack/pack-B* &&
+ touch -m -t 201901010003 .git/objects/pack/pack-A* &&
+ ls .git/objects/pack >expect &&
+ MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) &&
+ git multi-pack-index repack --batch-size=$MINSIZE &&
+ ls .git/objects/pack >actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'repack creates a new pack' '
+ (
+ cd dup &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 5 idx-list &&
+ THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 3 | tail -n 1) &&
+ BATCH_SIZE=$(($THIRD_SMALLEST_SIZE + 1)) &&
+ git multi-pack-index repack --batch-size=$BATCH_SIZE &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 6 idx-list &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 6 midx-list
+ )
+'
+
+test_expect_success 'expire removes repacked packs' '
+ (
+ cd dup &&
+ ls -al .git/objects/pack/*pack &&
+ ls -S .git/objects/pack/*pack | head -n 4 >expect &&
+ git multi-pack-index expire &&
+ ls -S .git/objects/pack/*pack >actual &&
+ test_cmp expect actual &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 4 midx-list
+ )
+'
+
+test_expect_success 'expire works when adding new packs' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/A
+ ^refs/heads/B
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/B
+ ^refs/heads/C
+ EOF
+ git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
+ refs/heads/C
+ ^refs/heads/D
+ EOF
+ git multi-pack-index write &&
+ git pack-objects --revs .git/objects/pack/a-pack <<-EOF &&
+ refs/heads/D
+ ^refs/heads/E
+ EOF
+ git multi-pack-index write &&
+ git pack-objects --revs .git/objects/pack/z-pack <<-EOF &&
+ refs/heads/E
+ EOF
+ git multi-pack-index expire &&
+ ls .git/objects/pack/ | grep idx >expect &&
+ test-tool read-midx .git/objects | grep idx >actual &&
+ test_cmp expect actual &&
+ git multi-pack-index verify
+ )
+'
+
+test_expect_success 'expire respects .keep files' '
+ (
+ cd dup &&
+ git pack-objects --revs .git/objects/pack/pack-all <<-EOF &&
+ refs/heads/A
+ EOF
+ git multi-pack-index write &&
+ PACKA=$(ls .git/objects/pack/a-pack*\.pack | sed s/\.pack\$//) &&
+ touch $PACKA.keep &&
+ git multi-pack-index expire &&
+ ls -S .git/objects/pack/a-pack* | grep $PACKA >a-pack-files &&
+ test_line_count = 3 a-pack-files &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 2 midx-list
+ )
+'
+
+test_expect_success 'repack --batch-size=0 repacks everything' '
+ (
+ cd dup &&
+ rm .git/objects/pack/*.keep &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 2 idx-list &&
+ git multi-pack-index repack --batch-size=0 &&
+ ls .git/objects/pack/*idx >idx-list &&
+ test_line_count = 3 idx-list &&
+ test-tool read-midx .git/objects | grep idx >midx-list &&
+ test_line_count = 3 midx-list &&
+ git multi-pack-index expire &&
+ ls -al .git/objects/pack/*idx >idx-list &&
+ test_line_count = 1 idx-list &&
+ git multi-pack-index repack --batch-size=0 &&
+ ls -al .git/objects/pack/*idx >new-idx-list &&
+ test_cmp idx-list new-idx-list
+ )
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='split commit graph'
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+
+test_expect_success 'setup repo' '
+ git init &&
+ git config core.commitGraph true &&
+ git config gc.writeCommitGraph false &&
+ infodir=".git/objects/info" &&
+ graphdir="$infodir/commit-graphs" &&
+ test_oid_init
+'
+
+graph_read_expect() {
+ NUM_BASE=0
+ if test ! -z $2
+ then
+ NUM_BASE=$2
+ fi
+ cat >expect <<- EOF
+ header: 43475048 1 1 3 $NUM_BASE
+ num_commits: $1
+ chunks: oid_fanout oid_lookup commit_metadata
+ EOF
+ git commit-graph read >output &&
+ test_cmp expect output
+}
+
+test_expect_success 'create commits and write commit-graph' '
+ for i in $(test_seq 3)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable &&
+ test_path_is_file $infodir/commit-graph &&
+ graph_read_expect 3
+'
+
+graph_git_two_modes() {
+ git -c core.commitGraph=true $1 >output
+ git -c core.commitGraph=false $1 >expect
+ test_cmp expect output
+}
+
+graph_git_behavior() {
+ MSG=$1
+ BRANCH=$2
+ COMPARE=$3
+ test_expect_success "check normal git operations: $MSG" '
+ graph_git_two_modes "log --oneline $BRANCH" &&
+ graph_git_two_modes "log --topo-order $BRANCH" &&
+ graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
+ graph_git_two_modes "branch -vv" &&
+ graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+ '
+}
+
+graph_git_behavior 'graph exists' commits/3 commits/1
+
+verify_chain_files_exist() {
+ for hash in $(cat $1/commit-graph-chain)
+ do
+ test_path_is_file $1/graph-$hash.graph || return 1
+ done
+}
+
+test_expect_success 'add more commits, and write a new base graph' '
+ git reset --hard commits/1 &&
+ for i in $(test_seq 4 5)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git reset --hard commits/2 &&
+ for i in $(test_seq 6 10)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git reset --hard commits/2 &&
+ git merge commits/4 &&
+ git branch merge/1 &&
+ git reset --hard commits/4 &&
+ git merge commits/6 &&
+ git branch merge/2 &&
+ git commit-graph write --reachable &&
+ graph_read_expect 12
+'
+
+test_expect_success 'fork and fail to base a chain on a commit-graph file' '
+ test_when_finished rm -rf fork &&
+ git clone . fork &&
+ (
+ cd fork &&
+ rm .git/objects/info/commit-graph &&
+ echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+ test_commit new-commit &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ verify_chain_files_exist $graphdir
+ )
+'
+
+test_expect_success 'add three more commits, write a tip graph' '
+ git reset --hard commits/3 &&
+ git merge merge/1 &&
+ git merge commits/5 &&
+ git merge merge/2 &&
+ git branch merge/3 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_missing $infodir/commit-graph &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 2 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'split commit-graph: merge 3 vs 2' merge/3 merge/2
+
+test_expect_success 'add one commit, write a tip graph' '
+ test_commit 11 &&
+ git branch commits/11 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_missing $infodir/commit-graph &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 3 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'three-layer commit-graph: commit 11 vs 6' commits/11 commits/6
+
+test_expect_success 'add one commit, write a merged graph' '
+ test_commit 12 &&
+ git branch commits/12 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 2 graph-files &&
+ verify_chain_files_exist $graphdir
+'
+
+graph_git_behavior 'merged commit-graph: commit 12 vs 6' commits/12 commits/6
+
+test_expect_success 'create fork and chain across alternate' '
+ git clone . fork &&
+ (
+ cd fork &&
+ git config core.commitGraph true &&
+ rm -rf $graphdir &&
+ echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+ test_commit 13 &&
+ git branch commits/13 &&
+ git commit-graph write --reachable --split &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files &&
+ git -c core.commitGraph=true rev-list HEAD >expect &&
+ git -c core.commitGraph=false rev-list HEAD >actual &&
+ test_cmp expect actual &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --object-dir=.git/objects/ &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ )
+'
+
+graph_git_behavior 'alternate: commit 13 vs 6' commits/13 commits/6
+
+test_expect_success 'test merge stragety constants' '
+ git clone . merge-2 &&
+ (
+ cd merge-2 &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --size-multiple=2 &&
+ test_line_count = 3 $graphdir/commit-graph-chain
+
+ ) &&
+ git clone . merge-10 &&
+ (
+ cd merge-10 &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 14 &&
+ git commit-graph write --reachable --split --size-multiple=10 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ ) &&
+ git clone . merge-10-expire &&
+ (
+ cd merge-10-expire &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 15 &&
+ git commit-graph write --reachable --split --size-multiple=10 --expire-time=1980-01-01 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 3 graph-files
+ ) &&
+ git clone --no-hardlinks . max-commits &&
+ (
+ cd max-commits &&
+ git config core.commitGraph true &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test_commit 16 &&
+ test_commit 17 &&
+ git commit-graph write --reachable --split --max-commits=1 &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ ls $graphdir/graph-*.graph >graph-files &&
+ test_line_count = 1 graph-files
+ )
+'
+
+test_expect_success 'remove commit-graph-chain file after flattening' '
+ git clone . flatten &&
+ (
+ cd flatten &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ git commit-graph write --reachable &&
+ test_path_is_missing $graphdir/commit-graph-chain &&
+ ls $graphdir >graph-files &&
+ test_line_count = 0 graph-files
+ )
+'
+
+corrupt_file() {
+ file=$1
+ pos=$2
+ data="${3:-\0}"
+ chmod a+w "$file" &&
+ printf "$data" | dd of="$file" bs=1 seek="$pos" conv=notrunc
+}
+
+test_expect_success 'verify hashes along chain, even in shallow' '
+ git clone --no-hardlinks . verify &&
+ (
+ cd verify &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1760 "\01" &&
+ test_must_fail git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "incorrect checksum" err
+ )
+'
+
+test_expect_success 'verify --shallow does not check base contents' '
+ git clone --no-hardlinks . verify-shallow &&
+ (
+ cd verify-shallow &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1000 "\01" &&
+ git commit-graph verify --shallow &&
+ test_must_fail git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "incorrect checksum" err
+ )
+'
+
+test_expect_success 'warn on base graph chunk incorrect' '
+ git clone --no-hardlinks . base-chunk &&
+ (
+ cd base-chunk &&
+ git commit-graph verify &&
+ base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$base_file" 1376 "\01" &&
+ git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "commit-graph chain does not match" err
+ )
+'
+
+test_expect_success 'verify after commit-graph-chain corruption' '
+ git clone --no-hardlinks . verify-chain &&
+ (
+ cd verify-chain &&
+ corrupt_file "$graphdir/commit-graph-chain" 60 "G" &&
+ git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "invalid commit-graph chain" err &&
+ corrupt_file "$graphdir/commit-graph-chain" 60 "A" &&
+ git commit-graph verify 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "unable to find all commit-graph files" err
+ )
+'
+
+test_expect_success 'verify across alternates' '
+ git clone --no-hardlinks . verify-alt &&
+ (
+ cd verify-alt &&
+ rm -rf $graphdir &&
+ altdir="$(pwd)/../.git/objects" &&
+ echo "$altdir" >.git/objects/info/alternates &&
+ git commit-graph verify --object-dir="$altdir/" &&
+ test_commit extra &&
+ git commit-graph write --reachable --split &&
+ tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+ corrupt_file "$tip_file" 100 "\01" &&
+ test_must_fail git commit-graph verify --shallow 2>test_err &&
+ grep -v "^+" test_err >err &&
+ test_i18ngrep "commit-graph has incorrect fanout value" err
+ )
+'
+
+test_expect_success 'add octopus merge' '
+ git reset --hard commits/10 &&
+ git merge commits/3 commits/4 &&
+ git branch merge/octopus &&
+ git commit-graph write --reachable --split &&
+ git commit-graph verify 2>err &&
+ test_line_count = 3 err &&
+ test_i18ngrep ! warning err &&
+ test_line_count = 3 $graphdir/commit-graph-chain
+'
+
+graph_git_behavior 'graph exists' merge/octopus commits/12
+
+test_expect_success 'split across alternate where alternate is not split' '
+ git commit-graph write --reachable &&
+ test_path_is_file .git/objects/info/commit-graph &&
+ cp .git/objects/info/commit-graph . &&
+ git clone --no-hardlinks . alt-split &&
+ (
+ cd alt-split &&
+ rm -f .git/objects/info/commit-graph &&
+ echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
+ test_commit 18 &&
+ git commit-graph write --reachable --split &&
+ test_line_count = 1 $graphdir/commit-graph-chain
+ ) &&
+ test_cmp commit-graph .git/objects/info/commit-graph
+'
+
+test_done
fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
test_expect_success 'fsck with invalid or bogus skipList input' '
git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err
+ test_i18ngrep "invalid object name: \[core\]" err
'
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
test_expect_success 'fsck with invalid abbreviated skipList input' '
echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
- test_i18ngrep "^fatal: Invalid SHA-1: " err-abbreviated
+ test_i18ngrep "^fatal: invalid object name: " err-abbreviated
'
test_expect_success 'fsck with exhaustive accepted skipList input (various types of comments etc.)' '
test_must_fail git push --porcelain dst bogus &&
git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config receive.fsck.skipList config &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+ test_i18ngrep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
git push --porcelain dst bogus
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "Could not open skip list: does-not-exist" err &&
+ test_i18ngrep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+ test_i18ngrep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
test_cmp expect actual
'
+test_expect_success '--no-show-forced-updates' '
+ mkdir forced-updates &&
+ (
+ cd forced-updates &&
+ git init &&
+ test_commit 1 &&
+ test_commit 2
+ ) &&
+ git clone forced-updates forced-update-clone &&
+ git clone forced-updates no-forced-update-clone &&
+ git -C forced-updates reset --hard HEAD~1 &&
+ (
+ cd forced-update-clone &&
+ git fetch --show-forced-updates origin 2>output &&
+ test_i18ngrep "(forced update)" output
+ ) &&
+ (
+ cd no-forced-update-clone &&
+ git fetch --no-show-forced-updates origin 2>output &&
+ test_i18ngrep ! "(forced update)" output
+ )
+'
+
setup_negotiation_tip () {
SERVER="$1"
URL="$2"
check_negotiation_tip
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
'
test_lazy_prereq GIT_DAEMON '
- test_tristate GIT_TEST_GIT_DAEMON &&
- test "$GIT_TEST_GIT_DAEMON" != false
+ git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
'
# This test spawns a daemon, so run it only if the user would be OK with
git remote rm origin &&
git remote add one ../one &&
git remote add two ../two &&
- git fetch --multiple one two &&
+ GIT_TRACE=1 git fetch --multiple one two 2>trace &&
git branch -r > output &&
- test_cmp ../expect output)
+ test_cmp ../expect output &&
+ grep "built-in: git gc" trace >gc &&
+ test_line_count = 1 gc
+ )
'
test_expect_success 'git fetch --multiple (bad remote names)' '
. ./test-lib.sh
-LF='
-'
-
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
git -C client fsck
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
have_not_sent c6 c4 c3
'
-test_expect_success 'unknown fetch.negotiationAlgorithm values error out' '
- rm -rf server client trace &&
- git init server &&
- test_commit -C server to_fetch &&
-
- git init client &&
- test_commit -C client on_client &&
- git -C client checkout on_client &&
-
- test_config -C client fetch.negotiationAlgorithm invalid &&
- test_must_fail git -C client fetch "$(pwd)/server" 2>err &&
- test_i18ngrep "unknown fetch negotiation algorithm" err &&
-
- # Explicit "default" value
- test_config -C client fetch.negotiationAlgorithm default &&
- git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" &&
-
- # Implementation detail: If there is nothing to fetch, we will not error out
- test_config -C client fetch.negotiationAlgorithm invalid &&
- git -C client fetch "$(pwd)/server" 2>err &&
- test_i18ngrep ! "unknown fetch negotiation algorithm" err
-'
-
test_expect_success 'when two skips collide, favor the larger one' '
rm -rf server client trace &&
git init server &&
--- /dev/null
+#!/bin/sh
+
+test_description='"git fetch/pull --set-upstream" basic tests.'
+. ./test-lib.sh
+
+check_config () {
+ printf "%s\n" "$2" "$3" >"expect.$1" &&
+ {
+ git config "branch.$1.remote" && git config "branch.$1.merge"
+ } >"actual.$1" &&
+ test_cmp "expect.$1" "actual.$1"
+}
+
+check_config_missing () {
+ test_expect_code 1 git config "branch.$1.remote" &&
+ test_expect_code 1 git config "branch.$1.merge"
+}
+
+clear_config () {
+ for branch in "$@"; do
+ test_might_fail git config --unset-all "branch.$branch.remote"
+ test_might_fail git config --unset-all "branch.$branch.merge"
+ done
+}
+
+ensure_fresh_upstream () {
+ rm -rf parent && git init --bare parent
+}
+
+test_expect_success 'setup bare parent fetch' '
+ ensure_fresh_upstream &&
+ git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other fetch' '
+ test_commit one &&
+ git push upstream master &&
+ git checkout -b other &&
+ test_commit two &&
+ git push upstream other
+'
+
+# tests for fetch --set-upstream
+
+test_expect_success 'fetch --set-upstream does not set upstream w/o branch' '
+ clear_config master other &&
+ git checkout master &&
+ git fetch --set-upstream upstream &&
+ check_config_missing master &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' '
+ clear_config master other &&
+ git fetch --set-upstream upstream master &&
+ check_config master upstream refs/heads/master &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream upstream other sets branch other' '
+ clear_config master other &&
+ git fetch --set-upstream upstream other &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other
+'
+
+test_expect_success 'fetch --set-upstream master:other does not set the branch other2' '
+ clear_config other2 &&
+ git fetch --set-upstream upstream master:other2 &&
+ check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+ # master explicitly not cleared, we check that it is not touched from previous value
+ clear_config other other2 &&
+ test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
+ clear_config other other2 &&
+ url="file://'"$PWD"'" &&
+ git fetch --set-upstream "$url" &&
+ check_config master "$url" HEAD &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+# tests for pull --set-upstream
+
+test_expect_success 'setup bare parent pull' '
+ git remote rm upstream &&
+ ensure_fresh_upstream &&
+ git remote add upstream parent
+'
+
+test_expect_success 'setup commit on master and other pull' '
+ test_commit three &&
+ git push --tags upstream master &&
+ test_commit four &&
+ git push upstream other
+'
+
+test_expect_success 'pull --set-upstream upstream master sets branch master but not other' '
+ clear_config master other &&
+ git pull --set-upstream upstream master &&
+ check_config master upstream refs/heads/master &&
+ check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' '
+ clear_config other2 &&
+ git pull --set-upstream upstream master:other2 &&
+ check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream upstream other sets branch master' '
+ clear_config master other &&
+ git pull --set-upstream upstream other &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other
+'
+
+test_expect_success 'pull --set-upstream upstream tag does not set the tag' '
+ clear_config three &&
+ git pull --tags --set-upstream upstream three &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' '
+ # master explicitly not cleared, we check that it is not touched from previous value
+ clear_config other other2 three &&
+ test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
+ check_config master upstream refs/heads/other &&
+ check_config_missing other &&
+ check_config_missing other2 &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
+ clear_config master other &&
+ git pull --set-upstream upstream HEAD &&
+ check_config master upstream HEAD &&
+ git checkout other &&
+ git pull --set-upstream upstream HEAD &&
+ check_config other upstream HEAD
+'
+
+test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' '
+ clear_config master three &&
+ git pull --set-upstream upstream master three &&
+ check_config_missing master &&
+ check_config_missing three
+'
+
+test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
+ clear_config master other other2 &&
+ git checkout master &&
+ url="file://'"$PWD"'" &&
+ git pull --set-upstream "$url" &&
+ check_config master "$url" HEAD &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
+ clear_config master other other2 &&
+ git checkout master &&
+ url="file://'"$PWD"'" &&
+ git pull --set-upstream "$url" master &&
+ check_config master "$url" refs/heads/master &&
+ check_config_missing other &&
+ check_config_missing other2
+'
+
+test_done
git -C client fsck &&
# Ensure that unneeded blobs are not inadvertently fetched.
- test_config -C client extensions.partialclone "not a remote" &&
+ test_config -C client remote.origin.promisor "false" &&
+ git -C client config --unset remote.origin.partialclonefilter &&
test_must_fail git -C client cat-file -e "$HASH1" &&
# But this blob was fetched, because clone performs an initial checkout
partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
( cd C && git fsck )
'
+test_expect_success 'setup repo with garbage in objects/*' '
+ git init S &&
+ (
+ cd S &&
+ test_commit A &&
+
+ cd .git/objects &&
+ >.some-hidden-file &&
+ >some-file &&
+ mkdir .some-hidden-dir &&
+ >.some-hidden-dir/some-file &&
+ >.some-hidden-dir/.some-dot-file &&
+ mkdir some-dir &&
+ >some-dir/some-file &&
+ >some-dir/.some-dot-file
+ )
+'
+
+test_expect_success 'clone a repo with garbage in objects/*' '
+ for option in --local --no-hardlinks --shared --dissociate
+ do
+ git clone $option S S$option || return 1 &&
+ git -C S$option fsck || return 1
+ done &&
+ find S-* -name "*some*" | sort >actual &&
+ cat >expected <<-EOF &&
+ S--dissociate/.git/objects/.some-hidden-dir
+ S--dissociate/.git/objects/.some-hidden-dir/.some-dot-file
+ S--dissociate/.git/objects/.some-hidden-dir/some-file
+ S--dissociate/.git/objects/.some-hidden-file
+ S--dissociate/.git/objects/some-dir
+ S--dissociate/.git/objects/some-dir/.some-dot-file
+ S--dissociate/.git/objects/some-dir/some-file
+ S--dissociate/.git/objects/some-file
+ S--local/.git/objects/.some-hidden-dir
+ S--local/.git/objects/.some-hidden-dir/.some-dot-file
+ S--local/.git/objects/.some-hidden-dir/some-file
+ S--local/.git/objects/.some-hidden-file
+ S--local/.git/objects/some-dir
+ S--local/.git/objects/some-dir/.some-dot-file
+ S--local/.git/objects/some-dir/some-file
+ S--local/.git/objects/some-file
+ S--no-hardlinks/.git/objects/.some-hidden-dir
+ S--no-hardlinks/.git/objects/.some-hidden-dir/.some-dot-file
+ S--no-hardlinks/.git/objects/.some-hidden-dir/some-file
+ S--no-hardlinks/.git/objects/.some-hidden-file
+ S--no-hardlinks/.git/objects/some-dir
+ S--no-hardlinks/.git/objects/some-dir/.some-dot-file
+ S--no-hardlinks/.git/objects/some-dir/some-file
+ S--no-hardlinks/.git/objects/some-file
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success SYMLINKS 'setup repo with manually symlinked or unknown files at objects/' '
+ git init T &&
+ (
+ cd T &&
+ git config gc.auto 0 &&
+ test_commit A &&
+ git gc &&
+ test_commit B &&
+
+ cd .git/objects &&
+ mv pack packs &&
+ ln -s packs pack &&
+ find ?? -type d >loose-dirs &&
+ last_loose=$(tail -n 1 loose-dirs) &&
+ mv $last_loose a-loose-dir &&
+ ln -s a-loose-dir $last_loose &&
+ first_loose=$(head -n 1 loose-dirs) &&
+ rm -f loose-dirs &&
+
+ cd $first_loose &&
+ obj=$(ls *) &&
+ mv $obj ../an-object &&
+ ln -s ../an-object $obj &&
+
+ cd ../ &&
+ find . -type f | sort >../../../T.objects-files.raw &&
+ find . -type l | sort >../../../T.objects-symlinks.raw &&
+ echo unknown_content >unknown_file
+ ) &&
+ git -C T fsck &&
+ git -C T rev-list --all --objects >T.objects
+'
+
+
+test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at objects/' '
+ for option in --local --no-hardlinks --shared --dissociate
+ do
+ git clone $option T T$option || return 1 &&
+ git -C T$option fsck || return 1 &&
+ git -C T$option rev-list --all --objects >T$option.objects &&
+ test_cmp T.objects T$option.objects &&
+ (
+ cd T$option/.git/objects &&
+ find . -type f | sort >../../../T$option.objects-files.raw &&
+ find . -type l | sort >../../../T$option.objects-symlinks.raw
+ )
+ done &&
+
+ for raw in $(ls T*.raw)
+ do
+ sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
+ -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1
+ done &&
+
+ cat >expected-files <<-EOF &&
+ ./Y/Z
+ ./Y/Z
+ ./a-loose-dir/Z
+ ./an-object
+ ./Y/Z
+ ./info/packs
+ ./pack/pack-Z.idx
+ ./pack/pack-Z.pack
+ ./packs/pack-Z.idx
+ ./packs/pack-Z.pack
+ ./unknown_file
+ EOF
+
+ for option in --local --no-hardlinks --dissociate
+ do
+ test_cmp expected-files T$option.objects-files.raw.de-sha || return 1 &&
+ test_must_be_empty T$option.objects-symlinks.raw.de-sha || return 1
+ done &&
+
+ echo ./info/alternates >expected-files &&
+ test_cmp expected-files T--shared.objects-files.raw &&
+ test_must_be_empty T--shared.objects-symlinks.raw
+'
+
test_done
test_path_is_missing fail.bundle.lock
'
+test_expect_success 'fetch SHA-1 from bundle' '
+ test_create_repo foo &&
+ test_commit -C foo x &&
+ git -C foo bundle create tip.bundle -1 master &&
+ git -C foo rev-parse HEAD >hash &&
+
+ # Exercise to ensure that fetching a SHA-1 from a bundle works with no
+ # errors
+ git fetch --no-tags foo/tip.bundle "$(cat hash)"
+'
+
test_done
test_cmp expect_1.oids observed.oids &&
test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
- test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
- test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none"
+ test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
+ test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
'
# checkout master to force dynamic object fetch of blobs at HEAD.
test_cmp unique_types.expected unique_types.observed
'
+test_expect_success 'implicitly construct combine: filter with repeated flags' '
+ GIT_TRACE=$(pwd)/trace git clone --bare \
+ --filter=blob:none --filter=tree:1 \
+ "file://$(pwd)/srv.bare" pc2 &&
+ grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
+ trace &&
+ git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
+
+ # We should have gotten some root trees.
+ grep " $" objects &&
+ # Should not have gotten any non-root trees or blobs.
+ ! grep " ." objects &&
+
+ xargs -n 1 git -C pc2 cat-file -t <objects >types &&
+ sort -u types >unique_types.actual &&
+ test_write_lines commit tree >unique_types.expected &&
+ test_cmp unique_types.expected unique_types.actual
+'
+
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
rm -rf src dst &&
git init src &&
! test -e "$HTTPD_ROOT_PATH/one-time-sed"
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='Test cloning repos with submodules using remote-tracking branches'
+
+. ./test-lib.sh
+
+pwd=$(pwd)
+
+test_expect_success 'setup' '
+ git checkout -b master &&
+ test_commit commit1 &&
+ mkdir sub &&
+ (
+ cd sub &&
+ git init &&
+ test_commit subcommit1 &&
+ git tag sub_when_added_to_super
+ ) &&
+ git submodule add "file://$pwd/sub" sub &&
+ git commit -m "add submodule" &&
+ (
+ cd sub &&
+ test_commit subcommit2
+ )
+'
+
+test_expect_success 'clone with --no-remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code sub_when_added_to_super
+ )
+'
+
+test_expect_success 'clone with --remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code remotes/origin/master
+ )
+'
+
+test_expect_success 'check the default is --no-remote-submodules' '
+ test_when_finished "rm -rf super_clone" &&
+ git clone --recurse-submodules "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
+ git diff --exit-code sub_when_added_to_super
+ )
+'
+
+test_done
--- /dev/null
+#!/bin/sh
+
+test_description='test handling of --alternate-refs traversal'
+. ./test-lib.sh
+
+# Avoid test_commit because we want a specific and known set of refs:
+#
+# base -- one
+# \ \
+# two -- merged
+#
+# where "one" and "two" are on separate refs, and "merged" is available only in
+# the dependent child repository.
+test_expect_success 'set up local refs' '
+ git checkout -b one &&
+ test_tick &&
+ git commit --allow-empty -m base &&
+ test_tick &&
+ git commit --allow-empty -m one &&
+ git checkout -b two HEAD^ &&
+ test_tick &&
+ git commit --allow-empty -m two
+'
+
+# We'll enter the child repository after it's set up since that's where
+# all of the subsequent tests will want to run (and it's easy to forget a
+# "-C child" and get nonsense results).
+test_expect_success 'set up shared clone' '
+ git clone -s . child &&
+ cd child &&
+ git merge origin/one
+'
+
+test_expect_success 'rev-list --alternate-refs' '
+ git rev-list --remotes=origin >expect &&
+ git rev-list --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rev-list --not --alternate-refs' '
+ git rev-parse HEAD >expect &&
+ git rev-list HEAD --not --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'limiting with alternateRefsPrefixes' '
+ test_config core.alternateRefsPrefixes refs/heads/one &&
+ git rev-list origin/one >expect &&
+ git rev-list --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --source shows .alternate marker' '
+ git log --oneline --source --remotes=origin >expect.orig &&
+ sed "s/origin.* /.alternate /" <expect.orig >expect &&
+ git log --oneline --source --alternate-refs >actual &&
+ test_cmp expect actual
+'
+
+test_done
grep "git< version 1" log
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
# Add extra commits to the client so that the whole fetch takes more
# than 1 request (due to negotiation)
- for i in $(test_seq 1 32)
- do
- test_commit -C client c$i
- done &&
+ test_commit_bulk -C client --id=c 32 &&
git -C server checkout -b newbranch base &&
test_commit -C server client_wants &&
grep "git< version 2" log
'
+test_expect_success 'fetch with http:// by hash without tag following with protocol v2 does not list refs' '
+ test_when_finished "rm -f log" &&
+
+ test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two_a &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" rev-parse two_a >two_a_hash &&
+
+ GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
+ fetch --no-tags origin $(cat two_a_hash) &&
+
+ grep "fetch< version 2" log &&
+ ! grep "fetch> command=ls-refs" log
+'
+
test_expect_success 'fetch from namespaced repo respects namespaces' '
test_when_finished "rm -f log" &&
# Create many commits to extend the negotiation phase across multiple
# requests, so that the server does not send "ready" in the first
# request.
- for i in $(test_seq 1 32)
- do
- test_commit -C http_child c$i
- done &&
+ test_commit_bulk -C http_child --id=c 32 &&
# After the acknowledgments section, pretend that a DELIM
# (0001) was sent instead of a FLUSH (0000).
test_i18ngrep "expected no other sections to be sent after no .ready." err
'
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
check_output
'
-. "$TEST_DIRECTORY"/lib-httpd.sh
-start_httpd
-
-REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
-LOCAL_PRISTINE="$(pwd)/local_pristine"
-
-test_expect_success 'setup repos for change-while-negotiating test' '
- (
- git init "$REPO" &&
- cd "$REPO" &&
- >.git/git-daemon-export-ok &&
- test_commit m1 &&
- git tag -d m1 &&
-
- # Local repo with many commits (so that negotiation will take
- # more than 1 request/response pair)
- git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
- cd "$LOCAL_PRISTINE" &&
- git checkout -b side &&
- for i in $(test_seq 1 33); do test_commit s$i; done &&
-
- # Add novel commits to upstream
- git checkout master &&
- cd "$REPO" &&
- test_commit m2 &&
- test_commit m3 &&
- git tag -d m2 m3
- ) &&
- git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
- git -C "$LOCAL_PRISTINE" config protocol.version 2
-'
-
-inconsistency () {
- # Simulate that the server initially reports $2 as the ref
- # corresponding to $1, and after that, $1 as the ref corresponding to
- # $1. This corresponds to the real-life situation where the server's
- # repository appears to change during negotiation, for example, when
- # different servers in a load-balancing arrangement serve (stateless)
- # RPCs during a single negotiation.
- printf "s/%s/%s/" \
- $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
- $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
- >"$HTTPD_ROOT_PATH/one-time-sed"
-}
-
-test_expect_success 'server is initially ahead - no ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant false &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master 1234567890123456789012345678901234567890 &&
- test_must_fail git -C local fetch 2>err &&
- test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
-'
-
-test_expect_success 'server is initially ahead - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master 1234567890123456789012345678901234567890 &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify master >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - no ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant false &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify "master^" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server is initially behind - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
- git -C local fetch &&
-
- git -C "$REPO" rev-parse --verify "master" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'server loses a ref - ref in want' '
- git -C "$REPO" config uploadpack.allowRefInWant true &&
- rm -rf local &&
- cp -r "$LOCAL_PRISTINE" local &&
- echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
- test_must_fail git -C local fetch 2>err &&
-
- test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
-'
-
REPO="$(pwd)/repo"
LOCAL_PRISTINE="$(pwd)/local_pristine"
git clone "file://$REPO" "$LOCAL_PRISTINE" &&
cd "$LOCAL_PRISTINE" &&
git checkout -b side &&
- for i in $(test_seq 1 33); do test_commit s$i; done &&
+ test_commit_bulk --id=s 33 &&
# Add novel commits to upstream
git checkout master &&
grep "want-ref refs/heads/o/bar" log
'
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
+LOCAL_PRISTINE="$(pwd)/local_pristine"
+
+test_expect_success 'setup repos for change-while-negotiating test' '
+ (
+ git init "$REPO" &&
+ cd "$REPO" &&
+ >.git/git-daemon-export-ok &&
+ test_commit m1 &&
+ git tag -d m1 &&
+
+ # Local repo with many commits (so that negotiation will take
+ # more than 1 request/response pair)
+ rm -rf "$LOCAL_PRISTINE" &&
+ git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
+ cd "$LOCAL_PRISTINE" &&
+ git checkout -b side &&
+ test_commit_bulk --id=s 33 &&
+
+ # Add novel commits to upstream
+ git checkout master &&
+ cd "$REPO" &&
+ test_commit m2 &&
+ test_commit m3 &&
+ git tag -d m2 m3
+ ) &&
+ git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
+ git -C "$LOCAL_PRISTINE" config protocol.version 2
+'
+
+inconsistency () {
+ # Simulate that the server initially reports $2 as the ref
+ # corresponding to $1, and after that, $1 as the ref corresponding to
+ # $1. This corresponds to the real-life situation where the server's
+ # repository appears to change during negotiation, for example, when
+ # different servers in a load-balancing arrangement serve (stateless)
+ # RPCs during a single negotiation.
+ printf "s/%s/%s/" \
+ $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
+ $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
+ >"$HTTPD_ROOT_PATH/one-time-sed"
+}
+
+test_expect_success 'server is initially ahead - no ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant false &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master 1234567890123456789012345678901234567890 &&
+ test_must_fail git -C local fetch 2>err &&
+ test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
+'
+
+test_expect_success 'server is initially ahead - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master 1234567890123456789012345678901234567890 &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify master >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - no ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant false &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master "master^" &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify "master^" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server is initially behind - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ inconsistency master "master^" &&
+ git -C local fetch &&
+
+ git -C "$REPO" rev-parse --verify "master" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'server loses a ref - ref in want' '
+ git -C "$REPO" config uploadpack.allowRefInWant true &&
+ rm -rf local &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ test_must_fail git -C local fetch 2>err &&
+
+ test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
+'
+
+# DO NOT add non-httpd-specific tests here, because the last part of this
+# test script is only executed when httpd is available and enabled.
+
test_done
! grep one output
'
+test_expect_success 'rev-list --objects --no-object-names has no space/names' '
+ git rev-list --objects --no-object-names HEAD >output &&
+ ! grep wanted_file output &&
+ ! grep unwanted_file output &&
+ ! grep " " output
+'
+
+test_expect_success 'rev-list --objects --no-object-names works with cat-file' '
+ git rev-list --objects --no-object-names --all >list-output &&
+ git cat-file --batch-check <list-output >cat-output &&
+ ! grep missing cat-output
+'
+
+test_expect_success '--no-object-names and --object-names are last-one-wins' '
+ git rev-list --objects --no-object-names --object-names --all >output &&
+ grep wanted_file output &&
+ git rev-list --objects --object-names --no-object-names --all >output &&
+ ! grep wanted_file output
+'
+
test_expect_success 'rev-list A..B and rev-list ^A B are the same' '
git commit --allow-empty -m another &&
git tag -a -m "annotated" v1.0 &&
test_cmp expect actual
'
+test_expect_success 'rev-list --end-of-options' '
+ git update-ref refs/heads/--output=yikes HEAD &&
+ git rev-list --end-of-options --output=yikes >actual &&
+ test_path_is_missing yikes &&
+ git rev-list HEAD >expect &&
+ test_cmp expect actual
+'
+
test_done
'
test_expect_success 'rev-list should fail' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all > /dev/null
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
'
test_expect_success 'git repack _MUST_ fail' \
git add missing/MISSING &&
git commit -m "6(broken): Added file that will be deleted" &&
git tag BROKEN_HASH6 &&
+ deleted=$(git rev-parse --verify HEAD:missing) &&
add_line_into_file "7(broken): second line on a broken branch" hello2 &&
git tag BROKEN_HASH7 &&
add_line_into_file "8(broken): third line on a broken branch" hello2 &&
git rm missing/MISSING &&
git commit -m "9(broken): Remove missing file" &&
git tag BROKEN_HASH9 &&
- rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d
+ rm .git/objects/$(test_oid_to_path $deleted)
'
echo "" > expected.ok
cat > expected.missing-tree.default <<EOF
-fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
+fatal: unable to read tree $deleted
EOF
test_expect_success 'bisect fails if tree is broken on start commit' '
"
cat > expected.bisect-log <<EOF
-# bad: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# good: [7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-git bisect start '32a594a3fdac2d57cf6d02987e30eec68511498c' '7b7f204a749c3125d5224ed61ea2ae1187ad046f'
-# good: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-git bisect good 3de952f2416b6084f557ec417709eac740c6818c
-# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
+# good: [$HASH2] Add <2: A new day for git> into <hello>.
+git bisect start '$HASH4' '$HASH2'
+# good: [$HASH3] Add <3: Another new day for git> into <hello>.
+git bisect good $HASH3
+# first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
EOF
test_expect_success 'bisect log: successful result' '
'
cat > expected.bisect-skip-log <<EOF
-# bad: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# good: [7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-git bisect start '32a594a3fdac2d57cf6d02987e30eec68511498c' '7b7f204a749c3125d5224ed61ea2ae1187ad046f'
-# skip: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-git bisect skip 3de952f2416b6084f557ec417709eac740c6818c
+# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
+# good: [$HASH2] Add <2: A new day for git> into <hello>.
+git bisect start '$HASH4' '$HASH2'
+# skip: [$HASH3] Add <3: Another new day for git> into <hello>.
+git bisect skip $HASH3
# only skipped commits left to test
-# possible first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-# possible first bad commit: [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+# possible first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
+# possible first bad commit: [$HASH3] Add <3: Another new day for git> into <hello>.
EOF
test_expect_success 'bisect log: only skip commits left' '
advance h
'
-script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
+t6040_script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
cat >expect <<\EOF
b1 [ahead 1, behind 1] d
b2 [ahead 1, behind 1] d
cd test &&
git branch -v
) |
- sed -n -e "$script" >actual &&
+ sed -n -e "$t6040_script" >actual &&
test_i18ncmp expect actual
'
cd test &&
git branch -vv
) |
- sed -n -e "$script" >actual &&
+ sed -n -e "$t6040_script" >actual &&
test_i18ncmp expect actual
'
test_i18ncmp expect actual
'
+cat >expect <<\EOF
+## b1...origin/master [different]
+EOF
+
+test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstream)' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=false status -s -b | head -1
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
cat >expect <<\EOF
On branch b1
Your branch and 'origin/master' have diverged,
test_i18ncmp expect actual
'
+test_expect_success 'status --long --branch' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=true status --long -b | head -3
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
cat >expect <<\EOF
On branch b1
Your branch and 'origin/master' refer to different commits.
test_i18ncmp expect actual
'
+test_expect_success 'status.aheadbehind=false status --long --branch' '
+ (
+ cd test &&
+ git checkout b1 >/dev/null &&
+ git -c status.aheadbehind=false status --long -b | head -2
+ ) >actual &&
+ test_i18ncmp expect actual
+'
+
cat >expect <<\EOF
## b5...brokenbase [gone]
EOF
)
'
+# Testcase 13e, directory rename in virtual merge base
+#
+# This testcase has a slightly different setup than all the above cases, in
+# order to include a recursive case:
+#
+# A C
+# o - o
+# / \ / \
+# O o X ?
+# \ / \ /
+# o o
+# B D
+#
+# Commit O: a/{z,y}
+# Commit A: b/{z,y}
+# Commit B: a/{z,y,x}
+# Commit C: b/{z,y,x}
+# Commit D: b/{z,y}, a/x
+# Expected: b/{z,y,x} (sort of; see below for why this might not be expected)
+#
+# NOTES: 'X' represents a virtual merge base. With the default of
+# directory rename detection yielding conflicts, merging A and B
+# results in a conflict complaining about whether 'x' should be
+# under 'a/' or 'b/'. However, when creating the virtual merge
+# base 'X', since virtual merge bases need to be written out as a
+# tree, we cannot have a conflict, so some resolution has to be
+# picked.
+#
+# In choosing the right resolution, it's worth noting here that
+# commits C & D are merges of A & B that choose different
+# locations for 'x' (i.e. they resolve the conflict differently),
+# and so it would be nice when merging C & D if git could detect
+# this difference of opinion and report a conflict. But the only
+# way to do so that I can think of would be to have the virtual
+# merge base place 'x' in some directory other than either 'a/' or
+# 'b/', which seems a little weird -- especially since it'd result
+# in a rename/rename(1to2) conflict with a source path that never
+# existed in any version.
+#
+# So, for now, when directory rename detection is set to
+# 'conflict' just avoid doing directory rename detection at all in
+# the recursive case. This will not allow us to detect a conflict
+# in the outer merge for this special kind of setup, but it at
+# least avoids hitting a BUG().
+#
+test_expect_success '13e-setup: directory rename detection in recursive case' '
+ test_create_repo 13e &&
+ (
+ cd 13e &&
+
+ mkdir a &&
+ echo z >a/z &&
+ echo y >a/y &&
+ git add a &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv a/ b/ &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ echo x >a/x &&
+ git add a &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git branch C A &&
+ git branch D B &&
+
+ git checkout C &&
+ test_must_fail git -c merge.directoryRenames=conflict merge B &&
+ git add b/x &&
+ test_tick &&
+ git commit -m "C" &&
+
+
+ git checkout D &&
+ test_must_fail git -c merge.directoryRenames=conflict merge A &&
+ git add b/x &&
+ mkdir a &&
+ git mv b/x a/x &&
+ test_tick &&
+ git commit -m "D"
+ )
+'
+
+test_expect_success '13e-check: directory rename detection in recursive case' '
+ (
+ cd 13e &&
+
+ git checkout --quiet D^0 &&
+
+ git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
+
+ test_i18ngrep ! CONFLICT out &&
+ test_i18ngrep ! BUG: err &&
+ test_i18ngrep ! core.dumped err &&
+ test_must_be_empty err &&
+
+ git ls-files >paths &&
+ ! grep a/x paths &&
+ grep b/x paths
+ )
+'
+
test_done
test_line_count = 2 actual &&
# Make sure no other trees were considered besides the root.
- ! grep "Skipping contents of tree [^.]" filter_trace
+ ! grep "Skipping contents of tree [^.]" filter_trace &&
+
+ # Try this again with "combine:". If both sub-filters are skipping
+ # trees, the composite filter should also skip trees. This is not
+ # important unless the user does combine:tree:X+tree:Y or another filter
+ # besides "tree:" is implemented in the future which can skip trees.
+ GIT_TRACE=1 git -C r3 rev-list \
+ --objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace &&
+
+ # Only skip the dir1/ tree, which is shared between the two commits.
+ grep "Skipping contents of tree " filter_trace >actual &&
+ test_write_lines "Skipping contents of tree dir1/..." >expected &&
+ test_cmp expected actual
'
# Test tree:# filters.
test_line_count = 10 actual
'
+test_expect_success 'combine:... for a simple combination' '
+ git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \
+ >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD dir1 &&
+
+ # There are also 2 commit objects
+ test_line_count = 5 actual &&
+
+ cp actual expected &&
+
+ # Try again using repeated --filter - this is equivalent to a manual
+ # combine with "combine:...+..."
+ git -C r3 rev-list --objects --filter=combine:tree:2 \
+ --filter=blob:none HEAD >actual &&
+
+ test_cmp expected actual
+'
+
+test_expect_success 'combine:... with URL encoding' '
+ git -C r3 rev-list --objects \
+ --filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD dir1 &&
+
+ # There are also 2 commit objects
+ test_line_count = 5 actual
+'
+
+expect_invalid_filter_spec () {
+ spec="$1" &&
+ err="$2" &&
+
+ test_must_fail git -C r3 rev-list --objects --filter="$spec" HEAD \
+ >actual 2>actual_stderr &&
+ test_must_be_empty actual &&
+ test_i18ngrep "$err" actual_stderr
+}
+
+test_expect_success 'combine:... while URL-encoding things that should not be' '
+ expect_invalid_filter_spec combine%3Atree:2+blob:none \
+ "invalid filter-spec"
+'
+
+test_expect_success 'combine: with nothing after the :' '
+ expect_invalid_filter_spec combine: "expected something after combine:"
+'
+
+test_expect_success 'parse error in first sub-filter in combine:' '
+ expect_invalid_filter_spec combine:tree:asdf+blob:none \
+ "expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with non-encoded reserved chars' '
+ expect_invalid_filter_spec combine:tree:2+sparse:@xyz \
+ "must escape char in sub-filter-spec: .@." &&
+ expect_invalid_filter_spec combine:tree:2+sparse:\` \
+ "must escape char in sub-filter-spec: .\`." &&
+ expect_invalid_filter_spec combine:tree:2+sparse:~abc \
+ "must escape char in sub-filter-spec: .\~."
+'
+
+test_expect_success 'validate err msg for "combine:<valid-filter>+"' '
+ expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>."
+'
+
+test_expect_success 'combine:... with edge-case hex digits: Ff Aa 0 9' '
+ git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \
+ HEAD >actual &&
+ test_line_count = 5 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \
+ HEAD >actual &&
+ test_line_count = 5 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual &&
+ test_line_count = 2 actual &&
+ git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \
+ HEAD >actual &&
+ test_line_count = 5 actual
+'
+
+test_expect_success 'add sparse pattern blobs whose paths have reserved chars' '
+ cp r3/pattern r3/pattern1+renamed% &&
+ cp r3/pattern "r3/p;at%ter+n" &&
+ cp r3/pattern r3/^~pattern &&
+ git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern &&
+ git -C r3 commit -m "add sparse pattern files with reserved chars"
+'
+
+test_expect_success 'combine:... with more than two sub-filters' '
+ git -C r3 rev-list --objects \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern \
+ HEAD >actual &&
+
+ expect_has HEAD "" &&
+ expect_has HEAD~1 "" &&
+ expect_has HEAD~2 "" &&
+ expect_has HEAD dir1 &&
+ expect_has HEAD dir1/sparse1 &&
+ expect_has HEAD dir1/sparse2 &&
+
+ # Should also have 3 commits
+ test_line_count = 9 actual &&
+
+ # Try again, this time making sure the last sub-filter is only
+ # URL-decoded once.
+ cp actual expect &&
+
+ git -C r3 rev-list --objects \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \
+ HEAD >actual &&
+ test_cmp expect actual &&
+
+ # Use the same composite filter again, but with a pattern file name that
+ # requires encoding multiple characters, and use implicit filter
+ # combining.
+ test_when_finished "rm -f trace1" &&
+ GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
+ --filter=tree:3 --filter=blob:limit=40 \
+ --filter=sparse:oid="master:p;at%ter+n" \
+ HEAD >actual &&
+
+ test_cmp expect actual &&
+ grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \
+ trace1 &&
+
+ # Repeat the above test, but this time, the characters to encode are in
+ # the LHS of the combined filter.
+ test_when_finished "rm -f trace2" &&
+ GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
+ --filter=sparse:oid=master:^~pattern \
+ --filter=tree:3 --filter=blob:limit=40 \
+ HEAD >actual &&
+
+ test_cmp expect actual &&
+ grep "Add to combine filter-spec: sparse:oid=master:%5e%7epattern" \
+ trace2
+'
+
# Test provisional omit collection logic with a repo that has objects appearing
# at multiple depths - first deeper than the filter's threshold, then shallow.
test_cmp expect actual
'
+test_expect_success 'setup r5' '
+ git init r5 &&
+ mkdir -p r5/subdir &&
+
+ echo 1 >r5/short-root &&
+ echo 12345 >r5/long-root &&
+ echo a >r5/subdir/short-subdir &&
+ echo abcde >r5/subdir/long-subdir &&
+
+ git -C r5 add short-root long-root subdir &&
+ git -C r5 commit -m "commit msg"
+'
+
+test_expect_success 'verify collecting omits in combined: filter' '
+ # Note that this test guards against the naive implementation of simply
+ # giving both filters the same "omits" set and expecting it to
+ # automatically merge them.
+ git -C r5 rev-list --objects --quiet --filter-print-omitted \
+ --filter=combine:tree:2+blob:limit=3 HEAD >actual &&
+
+ # Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root)
+ omitted_1=$(echo 12345 | git hash-object --stdin) &&
+ omitted_2=$(echo a | git hash-object --stdin) &&
+ omitted_3=$(echo abcde | git hash-object --stdin) &&
+
+ grep ~$omitted_1 actual &&
+ grep ~$omitted_2 actual &&
+ grep ~$omitted_3 actual &&
+ test_line_count = 3 actual
+'
+
# Test tree:<depth> where a tree is iterated to twice - once where a subentry is
# too deep to be included, and again where the blob inside it is shallow enough
# to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we
grep "blob:limit=1024" trace
'
-test_expect_success 'expand tree depth limit in protocol' '
- GIT_TRACE_PACKET="$(pwd)/tree_trace" git -c protocol.version=2 clone \
- --filter=tree:0k "file://$(pwd)/r2" tree &&
- ! grep "tree:0k" tree_trace &&
- grep "tree:0" tree_trace
-'
-
test_done
git commit -a -m "Right #5" &&
git checkout -b long &&
- i=0 &&
- while test $i -lt 30
- do
- test_commit $i one &&
- i=$(($i+1))
- done &&
+ test_commit_bulk --start=0 --message=%s --filename=one 30 &&
git show-branch &&
test_cmp expected actual
'
+cat >expected <<\EOF
+refs/tags/testtag
+refs/tags/testtag-2
+EOF
+
+test_expect_success 'exercise patterns with prefixes' '
+ git tag testtag-2 &&
+ test_when_finished "git tag -d testtag-2" &&
+ git for-each-ref --format="%(refname)" \
+ refs/tags/testtag refs/tags/testtag-2 >actual &&
+ test_cmp expected actual
+'
+
+cat >expected <<\EOF
+refs/tags/testtag
+refs/tags/testtag-2
+EOF
+
+test_expect_success 'exercise glob patterns with prefixes' '
+ git tag testtag-2 &&
+ test_when_finished "git tag -d testtag-2" &&
+ git for-each-ref --format="%(refname)" \
+ refs/tags/testtag "refs/tags/testtag-*" >actual &&
+ test_cmp expected actual
+'
+
cat >expected <<\EOF
'refs/heads/master'
'refs/remotes/origin/master'
test_cmp expected actual
'
+test_expect_success 'create tag without tagger' '
+ git tag -a -m "Broken tag" taggerless &&
+ git tag -f taggerless $(git cat-file tag taggerless |
+ sed -e "/^tagger /d" |
+ git hash-object --stdin -w -t tag)
+'
+
+test_atom refs/tags/taggerless type 'commit'
+test_atom refs/tags/taggerless tag 'taggerless'
+test_atom refs/tags/taggerless tagger ''
+test_atom refs/tags/taggerless taggername ''
+test_atom refs/tags/taggerless taggeremail ''
+test_atom refs/tags/taggerless taggerdate ''
+test_atom refs/tags/taggerless committer ''
+test_atom refs/tags/taggerless committername ''
+test_atom refs/tags/taggerless committeremail ''
+test_atom refs/tags/taggerless committerdate ''
+test_atom refs/tags/taggerless subject 'Broken tag'
+
test_expect_success 'an unusual tag with an incomplete line' '
git tag -m "bogo" bogo &&
test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
'
+test_expect_success 'validate worktree atom' '
+ cat >expect <<-EOF &&
+ master: $(pwd)
+ master_worktree: $(pwd)/worktree_dir
+ side: not checked out
+ EOF
+ git worktree add -b master_worktree worktree_dir master &&
+ git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
+ rm -r worktree_dir &&
+ git worktree prune &&
+ test_cmp expect actual
+'
+
test_done
some message
EOF
commit=$(git hash-object -t commit -w broken-commit) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
verbose git cat-file -e $commit &&
test_must_be_empty stderr
'
100644 blob 0000000000000000000000000000000000000003 foo
EOF
tree=$(git mktree --missing <broken-tree) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
git cat-file -e $tree &&
test_must_be_empty stderr
'
this is a broken tag
EOF
tag=$(git hash-object -t tag -w broken-tag) &&
- git gc 2>stderr &&
+ git gc -q 2>stderr &&
git cat-file -e $tag &&
test_must_be_empty stderr
'
test_cmp expect actual
'
+get_tag_header gpgsign-enabled $commit commit $time >expect
+echo "A message" >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success GPG \
+ 'git tag configured tag.gpgsign enables GPG sign' \
+ 'test_config tag.gpgsign true &&
+ git tag -m "A message" gpgsign-enabled &&
+ get_tag_msg gpgsign-enabled>actual &&
+ test_cmp expect actual
+'
+
+get_tag_header no-sign $commit commit $time >expect
+echo "A message" >>expect
+test_expect_success GPG \
+ 'git tag --no-sign configured tag.gpgsign skip GPG sign' \
+ 'test_config tag.gpgsign true &&
+ git tag -a --no-sign -m "A message" no-sign &&
+ get_tag_msg no-sign>actual &&
+ test_cmp expect actual
+'
+
test_expect_success GPG \
'trying to create a signed tag with non-existing -F file should fail' '
! test -f nonexistingfile &&
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
deleted by us: foo
no changes added to commit (use "git add" and/or "git commit -a")
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
both added: conflict.txt
deleted by them: main.txt
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
-
both deleted: main.txt
added by them: sub_master.txt
added by us: sub_second.txt
(use "git merge --abort" to abort the merge)
Changes to be committed:
-
new file: sub_master.txt
Unmerged paths:
(use "git rm <file>..." to mark resolution)
-
both deleted: main.txt
Untracked files not listed (use -u option to show untracked files)
EOF
git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+ test_cmp expect actual &&
+
+ # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+ git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
+ test_cmp expect actual &&
+
+ # Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+ git -c status.aheadbehind=true status --porcelain=v2 --branch --untracked-files=all >actual &&
test_cmp expect actual
)
'
test_expect_success 'checkout to detach HEAD' '
git config advice.detachedHead true &&
git checkout -f renamer && git clean -f &&
- GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
+ GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
grep "HEAD is now at 7329388" messages &&
test_line_count -gt 1 messages &&
H=$(git rev-parse --verify HEAD) &&
)
'
-test_expect_failure 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
+test_expect_failure !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
test_when_finished "git -C directory-submodule/path reset --hard" &&
test_when_finished "git -C directory-submodule reset --hard" &&
(
exit 0
EOF
-test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
+test_expect_success !FAIL_PREREQS,!AUTOIDENT 'do not fire editor when committer is bogus' '
>.git/result &&
echo >>negative &&
--- /dev/null
+#!/bin/sh
+
+test_description='pre-commit and pre-merge-commit hooks'
+
+. ./test-lib.sh
+
+HOOKDIR="$(git rev-parse --git-dir)/hooks"
+PRECOMMIT="$HOOKDIR/pre-commit"
+PREMERGE="$HOOKDIR/pre-merge-commit"
+
+# Prepare sample scripts that write their $0 to actual_hooks
+test_expect_success 'sample script setup' '
+ mkdir -p "$HOOKDIR" &&
+ write_script "$HOOKDIR/success.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 0
+ EOF
+ write_script "$HOOKDIR/fail.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 1
+ EOF
+ write_script "$HOOKDIR/non-exec.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ exit 1
+ EOF
+ chmod -x "$HOOKDIR/non-exec.sample" &&
+ write_script "$HOOKDIR/require-prefix.sample" <<-\EOF &&
+ echo $0 >>actual_hooks
+ test $GIT_PREFIX = "success/"
+ EOF
+ write_script "$HOOKDIR/check-author.sample" <<-\EOF
+ echo $0 >>actual_hooks
+ test "$GIT_AUTHOR_NAME" = "New Author" &&
+ test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
+ EOF
+'
+
+test_expect_success 'root commit' '
+ echo "root" >file &&
+ git add file &&
+ git commit -m "zeroth" &&
+ git checkout -b side &&
+ echo "foo" >foo &&
+ git add foo &&
+ git commit -m "make it non-ff" &&
+ git branch side-orig side &&
+ git checkout master
+'
+
+test_expect_success 'setup conflicting branches' '
+ test_when_finished "git checkout master" &&
+ git checkout -b conflicting-a master &&
+ echo a >conflicting &&
+ git add conflicting &&
+ git commit -m conflicting-a &&
+ git checkout -b conflicting-b master &&
+ echo b >conflicting &&
+ git add conflicting &&
+ git commit -m conflicting-b
+'
+
+test_expect_success 'with no hook' '
+ test_when_finished "rm -f actual_hooks" &&
+ echo "foo" >file &&
+ git add file &&
+ git commit -m "first" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with no hook (merge)' '
+ test_when_finished "rm -f actual_hooks" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook' '
+ test_when_finished "rm -f actual_hooks" &&
+ echo "bar" >file &&
+ git add file &&
+ git commit --no-verify -m "bar" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with no hook (merge)' '
+ test_when_finished "rm -f actual_hooks" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with succeeding hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more" >>file &&
+ git add file &&
+ git commit -m "more" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with succeeding hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ echo "$PREMERGE" >expected_hooks &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'automatic merge fails; both hooks are available' '
+ test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" &&
+ test_when_finished "rm -f expected_hooks actual_hooks" &&
+ test_when_finished "git checkout master" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+
+ git checkout conflicting-a &&
+ test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+ test_path_is_missing actual_hooks &&
+
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo a+b >conflicting &&
+ git add conflicting &&
+ git commit -m "resolve conflict" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
+ echo "even more" >>file &&
+ git add file &&
+ git commit --no-verify -m "even more" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success '--no-verify with succeeding hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/success.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "another" >>file &&
+ git add file &&
+ test_must_fail git commit -m "another" &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PRECOMMIT" &&
+ echo "stuff" >>file &&
+ git add file &&
+ git commit --no-verify -m "stuff" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with failing hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+ echo "$PREMERGE" >expected_hooks &&
+ git checkout side &&
+ test_must_fail git merge -m "merge master" master &&
+ git checkout master &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success '--no-verify with failing hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ echo "content" >>file &&
+ git add file &&
+ git commit -m "content" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" &&
+ echo "more content" >>file &&
+ git add file &&
+ git commit --no-verify -m "more content" &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM 'with non-executable hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
+ test_when_finished "rm -f \"$PREMERGE\" actual_hooks" &&
+ cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
+ git branch -f side side-orig &&
+ git checkout side &&
+ git merge --no-verify -m "merge master" master &&
+ git checkout master &&
+ test_path_is_missing actual_hooks
+'
+
+test_expect_success 'with hook requiring GIT_PREFIX' '
+ test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" &&
+ cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more content" >>file &&
+ git add file &&
+ mkdir success &&
+ (
+ cd success &&
+ git commit -m "hook requires GIT_PREFIX = success/"
+ ) &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'with failing hook requiring GIT_PREFIX' '
+ test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" &&
+ cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" &&
+ echo "$PRECOMMIT" >expected_hooks &&
+ echo "more content" >>file &&
+ git add file &&
+ mkdir fail &&
+ (
+ cd fail &&
+ test_must_fail git commit -m "hook must fail"
+ ) &&
+ git checkout -- file &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_expect_success 'check the author in hook' '
+ test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
+ cp "$HOOKDIR/check-author.sample" "$PRECOMMIT" &&
+ cat >expected_hooks <<-EOF &&
+ $PRECOMMIT
+ $PRECOMMIT
+ $PRECOMMIT
+ EOF
+ test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+ (
+ GIT_AUTHOR_NAME="New Author" &&
+ GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+ export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+ git commit --allow-empty -m "by new.author via env" &&
+ git show -s
+ ) &&
+ git commit --author="New Author <newauthor@example.com>" \
+ --allow-empty -m "by new.author via command line" &&
+ git show -s &&
+ test_cmp expected_hooks actual_hooks
+'
+
+test_done
+++ /dev/null
-#!/bin/sh
-
-test_description='pre-commit hook'
-
-. ./test-lib.sh
-
-test_expect_success 'with no hook' '
-
- echo "foo" > file &&
- git add file &&
- git commit -m "first"
-
-'
-
-test_expect_success '--no-verify with no hook' '
-
- echo "bar" > file &&
- git add file &&
- git commit --no-verify -m "bar"
-
-'
-
-# now install hook that always succeeds
-HOOKDIR="$(git rev-parse --git-dir)/hooks"
-HOOK="$HOOKDIR/pre-commit"
-mkdir -p "$HOOKDIR"
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 0
-EOF
-chmod +x "$HOOK"
-
-test_expect_success 'with succeeding hook' '
-
- echo "more" >> file &&
- git add file &&
- git commit -m "more"
-
-'
-
-test_expect_success '--no-verify with succeeding hook' '
-
- echo "even more" >> file &&
- git add file &&
- git commit --no-verify -m "even more"
-
-'
-
-# now a hook that fails
-cat > "$HOOK" <<EOF
-#!/bin/sh
-exit 1
-EOF
-
-test_expect_success 'with failing hook' '
-
- echo "another" >> file &&
- git add file &&
- test_must_fail git commit -m "another"
-
-'
-
-test_expect_success '--no-verify with failing hook' '
-
- echo "stuff" >> file &&
- git add file &&
- git commit --no-verify -m "stuff"
-
-'
-
-chmod -x "$HOOK"
-test_expect_success POSIXPERM 'with non-executable hook' '
-
- echo "content" >> file &&
- git add file &&
- git commit -m "content"
-
-'
-
-test_expect_success POSIXPERM '--no-verify with non-executable hook' '
-
- echo "more content" >> file &&
- git add file &&
- git commit --no-verify -m "more content"
-
-'
-chmod +x "$HOOK"
-
-# a hook that checks $GIT_PREFIX and succeeds inside the
-# success/ subdirectory only
-cat > "$HOOK" <<EOF
-#!/bin/sh
-test \$GIT_PREFIX = success/
-EOF
-
-test_expect_success 'with hook requiring GIT_PREFIX' '
-
- echo "more content" >> file &&
- git add file &&
- mkdir success &&
- (
- cd success &&
- git commit -m "hook requires GIT_PREFIX = success/"
- ) &&
- rmdir success
-'
-
-test_expect_success 'with failing hook requiring GIT_PREFIX' '
-
- echo "more content" >> file &&
- git add file &&
- mkdir fail &&
- (
- cd fail &&
- test_must_fail git commit -m "hook must fail"
- ) &&
- rmdir fail &&
- git checkout -- file
-'
-
-test_expect_success 'check the author in hook' '
- write_script "$HOOK" <<-\EOF &&
- test "$GIT_AUTHOR_NAME" = "New Author" &&
- test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
- EOF
- test_must_fail git commit --allow-empty -m "by a.u.thor" &&
- (
- GIT_AUTHOR_NAME="New Author" &&
- GIT_AUTHOR_EMAIL="newauthor@example.com" &&
- export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
- git commit --allow-empty -m "by new.author via env" &&
- git show -s
- ) &&
- git commit --author="New Author <newauthor@example.com>" \
- --allow-empty -m "by new.author via command line" &&
- git show -s
-'
-
-test_done
# (use "git pull" to merge the remote branch into yours)
#
# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
+# (use "git restore --staged <file>..." to unstage)
# new file: dir2/added
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
-# (use "git checkout -- <file>..." to discard changes in working directory)
-#
+# (use "git restore <file>..." to discard changes in working directory)
# modified: dir1/modified
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
-#
# dir1/untracked dir2/untracked
# dir2/modified untracked
#
# (use "git pull" to merge the remote branch into yours)
#
# Changes to be committed:
-# (use "git reset HEAD <file>..." to unstage)
-#
+# (use "git restore --staged <file>..." to unstage)
# new file: dir2/added
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
-# (use "git checkout -- <file>..." to discard changes in working directory)
-#
+# (use "git restore <file>..." to discard changes in working directory)
# modified: dir1/modified
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
-#
# dir1/untracked
# dir2/modified
# dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir2/modified
Ignored files:
(use "git add -f <file>..." to include in what will be committed)
-
.gitignore
dir1/untracked
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Ignored files:
(use "git add -f <file>..." to include in what will be committed)
-
.gitignore
dir1/untracked
dir2/modified
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files not listed (use -u option to show untracked files)
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: ../dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
untracked
../dir2/modified
../dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
<GREEN>new file: dir2/added<RESET>
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
<RED>modified: dir1/modified<RESET>
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
<BLUE>dir1/untracked<RESET>
<BLUE>dir2/modified<RESET>
<BLUE>dir2/untracked<RESET>
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/
untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD^1 <file>..." to unstage)
-
+ (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
new file: dir2/added
new file: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
dir1/untracked
dir2/modified
dir2/untracked
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Submodule changes to be committed:
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
+ (use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
-
modified: dir1/modified
modified: sm (modified content)
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
modified: sm (new commits)
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
; (use "git pull" to merge the remote branch into yours)
;
; Changes to be committed:
-; (use "git reset HEAD <file>..." to unstage)
-;
+; (use "git restore --staged <file>..." to unstage)
; modified: sm
;
; Changes not staged for commit:
; (use "git add <file>..." to update what will be committed)
-; (use "git checkout -- <file>..." to discard changes in working directory)
-;
+; (use "git restore <file>..." to discard changes in working directory)
; modified: dir1/modified
; modified: sm (new commits)
;
;
; Untracked files:
; (use "git add <file>..." to include in what will be committed)
-;
; .gitmodules
; dir1/untracked
; dir2/modified
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files:
(use "git add <file>..." to include in what will be committed)
-
.gitmodules
dir1/untracked
dir2/modified
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: sm
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: dir1/modified
Untracked files not listed (use -u option to show untracked files)
Unmerged paths:
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
(use "git commit" to conclude merge)
Changes to be committed:
-
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
+ (use "git restore <file>..." to discard changes in working directory)
modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
Unmerged paths:
(use "git add <file>..." to mark resolution)
-
both modified: main.txt
no changes added to commit (use "git add" and/or "git commit -a")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
-
modified: main.txt
Untracked files not listed (use -u option to show untracked files)
test_i18ncmp expected actual
'
+test_expect_success 'status shows cherry-pick with invalid oid' '
+ mkdir .git/sequencer &&
+ test_write_lines "pick invalid-oid" >.git/sequencer/todo &&
+ git status --untracked-files=no >actual 2>err &&
+ git cherry-pick --quit &&
+ test_must_be_empty err &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success 'status does not show error if .git/sequencer is a file' '
+ test_when_finished "rm .git/sequencer" &&
+ test_write_lines hello >.git/sequencer &&
+ git status --untracked-files=no 2>err &&
+ test_must_be_empty err
+'
+
test_expect_success 'status showing detached at and from a tag' '
test_commit atag tagging &&
git checkout atag &&
(use "git revert --abort" to cancel the revert operation)
Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
+ (use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
-
both modified: to-revert.txt
no changes added to commit (use "git add" and/or "git commit -a")
(use "git revert --abort" to cancel the revert operation)
Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
+ (use "git restore --staged <file>..." to unstage)
modified: to-revert.txt
Untracked files not listed (use -u option to show untracked files)
verify_parents $c0 $c1
'
+test_expect_success 'merge --quit' '
+ git init merge-quit &&
+ (
+ cd merge-quit &&
+ test_commit base &&
+ echo one >>base.t &&
+ git commit -am one &&
+ git branch one &&
+ git checkout base &&
+ echo two >>base.t &&
+ git commit -am two &&
+ test_must_fail git -c rerere.enabled=true merge one &&
+ test_path_is_file .git/MERGE_HEAD &&
+ test_path_is_file .git/MERGE_MODE &&
+ test_path_is_file .git/MERGE_MSG &&
+ git rerere status >rerere.before &&
+ git merge --quit &&
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_path_is_missing .git/MERGE_MODE &&
+ test_path_is_missing .git/MERGE_MSG &&
+ git rerere status >rerere.after &&
+ test_must_be_empty rerere.after &&
+ ! test_cmp rerere.after rerere.before
+ )
+'
+
+test_expect_success 'merge suggests matching remote refname' '
+ git commit --allow-empty -m not-local &&
+ git update-ref refs/remotes/origin/not-local HEAD &&
+ git reset --hard HEAD^ &&
+
+ # This is white-box testing hackery; we happen to know
+ # that reading packed refs is more picky about the memory
+ # ownership of strings we pass to for_each_ref() callbacks.
+ git pack-refs --all --prune &&
+
+ test_must_fail git merge not-local 2>stderr &&
+ grep origin/not-local stderr
+'
+
+test_expect_success 'suggested names are not ambiguous' '
+ git update-ref refs/heads/origin/not-local HEAD &&
+ test_must_fail git merge not-local 2>stderr &&
+ grep remotes/origin/not-local stderr
+'
+
test_done
git checkout -b test$test_count branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "" | git mergetool both ) &&
- ( yes "" | git mergetool file1 file1 ) &&
- ( yes "" | git mergetool file2 "spaced name" ) &&
- ( yes "" | git mergetool subdir/file3 ) &&
- ( yes "d" | git mergetool file11 ) &&
- ( yes "d" | git mergetool file12 ) &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat file1)" = "master updated" &&
- test "$(cat file2)" = "master new" &&
- test "$(cat subdir/file3)" = "master new sub" &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ yes "" | git mergetool both &&
+ yes "" | git mergetool file1 file1 &&
+ yes "" | git mergetool file2 "spaced name" &&
+ yes "" | git mergetool subdir/file3 &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "master new" >expect &&
+ test_cmp expect file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool"
'
git checkout -b test$test_count branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "" | git mergetool --gui both ) &&
- ( yes "" | git mergetool -g file1 file1 ) &&
- ( yes "" | git mergetool --gui file2 "spaced name" ) &&
- ( yes "" | git mergetool --gui subdir/file3 ) &&
- ( yes "d" | git mergetool --gui file11 ) &&
- ( yes "d" | git mergetool --gui file12 ) &&
- ( yes "l" | git mergetool --gui submod ) &&
- test "$(cat file1)" = "gui master updated" &&
- test "$(cat file2)" = "gui master new" &&
- test "$(cat subdir/file3)" = "gui master new sub" &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ yes "" | git mergetool --gui both &&
+ yes "" | git mergetool -g file1 file1 &&
+ yes "" | git mergetool --gui file2 "spaced name" &&
+ yes "" | git mergetool --gui subdir/file3 &&
+ yes "d" | git mergetool --gui file11 &&
+ yes "d" | git mergetool --gui file12 &&
+ yes "l" | git mergetool --gui submod &&
+ echo "gui master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "gui master new" >expect &&
+ test_cmp expect file2 &&
+ echo "gui master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool"
'
git checkout -b test$test_count branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "" | git mergetool --gui both ) &&
- ( yes "" | git mergetool -g file1 file1 ) &&
- ( yes "" | git mergetool --gui file2 "spaced name" ) &&
- ( yes "" | git mergetool --gui subdir/file3 ) &&
- ( yes "d" | git mergetool --gui file11 ) &&
- ( yes "d" | git mergetool --gui file12 ) &&
- ( yes "l" | git mergetool --gui submod ) &&
- test "$(cat file1)" = "master updated" &&
- test "$(cat file2)" = "master new" &&
- test "$(cat subdir/file3)" = "master new sub" &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ yes "" | git mergetool --gui both &&
+ yes "" | git mergetool -g file1 file1 &&
+ yes "" | git mergetool --gui file2 "spaced name" &&
+ yes "" | git mergetool --gui subdir/file3 &&
+ yes "d" | git mergetool --gui file11 &&
+ yes "d" | git mergetool --gui file12 &&
+ yes "l" | git mergetool --gui submod &&
+ echo "master updated" >expect &&
+ test_cmp expect file1 &&
+ echo "master new" >expect &&
+ test_cmp expect file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool"
'
test_config core.autocrlf true &&
git checkout -b test$test_count branch1 &&
test_must_fail git merge master &&
- ( yes "" | git mergetool file1 ) &&
- ( yes "" | git mergetool file2 ) &&
- ( yes "" | git mergetool "spaced name" ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "" | git mergetool subdir/file3 ) &&
- ( yes "d" | git mergetool file11 ) &&
- ( yes "d" | git mergetool file12 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 &&
+ yes "" | git mergetool file2 &&
+ yes "" | git mergetool "spaced name" &&
+ yes "" | git mergetool both &&
+ yes "" | git mergetool subdir/file3 &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "r" | git mergetool submod &&
test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool - autocrlf"
'
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "" | git mergetool file3 ) &&
- test "$(cat file3)" = "master new sub"
+ yes "" | git mergetool file3 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3
)
'
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "" | git mergetool file3 ) &&
- ( yes "" | git mergetool ../file1 ) &&
- ( yes "" | git mergetool ../file2 ../spaced\ name ) &&
- ( yes "" | git mergetool ../both ) &&
- ( yes "d" | git mergetool ../file11 ) &&
- ( yes "d" | git mergetool ../file12 ) &&
- ( yes "l" | git mergetool ../submod ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat ../submod/bar)" = "branch1 submodule" &&
+ yes "" | git mergetool file3 &&
+ yes "" | git mergetool ../file1 &&
+ yes "" | git mergetool ../file2 ../spaced\ name &&
+ yes "" | git mergetool ../both &&
+ yes "d" | git mergetool ../file11 &&
+ yes "d" | git mergetool ../file12 &&
+ yes "l" | git mergetool ../submod &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch1 resolved with mergetool - subdir"
)
'
git submodule update -N &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "d" | git mergetool file11 ) &&
- ( yes "d" | git mergetool file12 ) &&
- ( yes "l" | git mergetool submod ) &&
+ yes "d" | git mergetool file11 &&
+ yes "d" | git mergetool file12 &&
+ yes "l" | git mergetool submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging"
'
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "r" | git mergetool ../submod ) &&
- ( yes "d" "d" | git mergetool --no-prompt ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat file3)" = "master new sub" &&
+ yes "r" | git mergetool ../submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- test "$(cat ../submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
'
(
cd subdir &&
test_must_fail git merge master &&
- ( yes "r" | git mergetool ../submod ) &&
- ( yes "d" "d" | git mergetool --no-prompt ) &&
- test "$(cat ../file1)" = "master updated" &&
- test "$(cat ../file2)" = "master new" &&
- test "$(cat file3)" = "master new sub" &&
+ yes "r" | git mergetool ../submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
+ echo "master updated" >expect &&
+ test_cmp expect ../file1 &&
+ echo "master new" >expect &&
+ test_cmp expect ../file2 &&
+ echo "master new sub" >expect &&
+ test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- test "$(cat ../submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
'
git checkout -b test$test_count branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "l" | git mergetool --no-prompt submod ) &&
- ( yes "d" "d" | git mergetool --no-prompt ) &&
+ yes "l" | git mergetool --no-prompt submod &&
+ yes "d" "d" | git mergetool --no-prompt &&
git submodule update -N &&
output="$(yes "n" | git mergetool --no-prompt)" &&
test "$output" = "No files need merging"
git submodule update -N &&
test_must_fail git merge master &&
- ( yes "" | git mergetool subdir ) &&
+ yes "" | git mergetool subdir &&
- test "$(cat subdir/file3)" = "master new sub"
+ echo "master new sub" >expect &&
+ test_cmp expect subdir/file3
'
test_expect_success 'mergetool delete/delete conflict' '
git checkout -b test$test_count.a test$test_count &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
rmdir submod && mv submod-movedaside submod &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module" &&
git submodule update -N &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "l" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
test ! -e submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
test ! -e submod &&
test -d submod.orig &&
git submodule update -N &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/bar)" = "master submodule" &&
- git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
+ git submodule update -N &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module"
git checkout -b test$test_count.a branch1 &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
rmdir submod && mv submod-movedaside submod &&
- test "$(cat submod/bar)" = "branch1 submodule" &&
+ echo "branch1 submodule" >expect &&
+ test_cmp expect submod/bar &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module" &&
git checkout -b test$test_count.b test$test_count &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "l" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
git submodule update -N &&
- test "$(cat submod)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "r" | git mergetool submod ) &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "r" | git mergetool submod &&
test -d submod.orig &&
git submodule update -N &&
- test "$(cat submod)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
- ( yes "" | git mergetool both ) &&
- ( yes "d" | git mergetool file11 file12 ) &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/bar)" = "master submodule" &&
- git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+ yes "" | git mergetool both &&
+ yes "d" | git mergetool file11 file12 &&
+ yes "l" | git mergetool submod &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
+ git submodule update -N &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping module"
test_must_fail git merge test$test_count.a &&
(
cd subdir &&
- ( yes "l" | git mergetool subdir_module )
+ yes "l" | git mergetool subdir_module
) &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git submodule update -N &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git reset --hard &&
git submodule update -N &&
test_must_fail git merge test$test_count.a &&
- ( yes "r" | git mergetool subdir/subdir_module ) &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+ yes "r" | git mergetool subdir/subdir_module &&
+ echo "test$test_count.b" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git submodule update -N &&
- test "$(cat subdir/subdir_module/file15)" = "test$test_count.a" &&
+ echo "test$test_count.a" >expect &&
+ test_cmp expect subdir/subdir_module/file15 &&
git commit -m "branch1 resolved with mergetool"
'
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
- ( yes "l" | git mergetool submod ) &&
- test "$(cat submod/file16)" = "not a submodule" &&
+ yes "l" | git mergetool submod &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod/file16 &&
rm -rf submod.orig &&
git reset --hard &&
test_must_fail git merge master &&
test -n "$(git ls-files -u)" &&
test ! -e submod.orig &&
- ( yes "r" | git mergetool submod ) &&
+ yes "r" | git mergetool submod &&
test -d submod.orig &&
- test "$(cat submod.orig/file16)" = "not a submodule" &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod.orig/file16 &&
rm -r submod.orig &&
mv submod-movedaside/.git submod &&
( cd submod && git clean -f && git reset --hard ) &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git reset --hard &&
rm -rf submod-movedaside &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
- ( yes "l" | git mergetool submod ) &&
+ yes "l" | git mergetool submod &&
git submodule update -N &&
- test "$(cat submod/bar)" = "master submodule" &&
+ echo "master submodule" >expect &&
+ test_cmp expect submod/bar &&
git reset --hard &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
test ! -e submod.orig &&
- ( yes "r" | git mergetool submod ) &&
- test "$(cat submod/file16)" = "not a submodule" &&
+ yes "r" | git mergetool submod &&
+ echo "not a submodule" >expect &&
+ test_cmp expect submod/file16 &&
git reset --hard master &&
( cd submod && git clean -f && git reset --hard ) &&
test -z "$bitmap"
'
+test_expect_success 'no bitmaps created if .keep files present' '
+ pack=$(ls bare.git/objects/pack/*.pack) &&
+ test_path_is_file "$pack" &&
+ keep=${pack%.pack}.keep &&
+ test_when_finished "rm -f \"\$keep\"" &&
+ >"$keep" &&
+ git -C bare.git repack -ad 2>stderr &&
+ test_must_be_empty stderr &&
+ find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'auto-bitmaps do not complain if unavailable' '
+ test_config -C bare.git pack.packSizeLimit 1M &&
+ blob=$(test-tool genrandom big $((1024*1024)) |
+ git -C bare.git hash-object -w --stdin) &&
+ git -C bare.git update-ref refs/tags/big $blob &&
+ git -C bare.git repack -ad 2>stderr &&
+ test_must_be_empty stderr &&
+ find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
+ test_must_be_empty actual
+'
+
test_done
test_cmp expected actual
'
- test_expect_success !PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
+ test_expect_success !FAIL_PREREQS,!PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
test_must_fail git -c grep.patterntype=perl grep "foo.*bar"
'
test_cmp expected actual
'
-test_expect_success !PCRE 'grep --perl-regexp pattern errors without PCRE' '
+test_expect_success !FAIL_PREREQS,!PCRE 'grep --perl-regexp pattern errors without PCRE' '
test_must_fail git grep --perl-regexp "foo.*bar"
'
'
-test_expect_success !PCRE 'grep -P pattern errors without PCRE' '
+test_expect_success !FAIL_PREREQS,!PCRE 'grep -P pattern errors without PCRE' '
test_must_fail git grep -P "foo.*bar"
'
echo "(3|4)" >b/b &&
git add a b &&
git commit -m "add a and b" &&
+ test_tick &&
git init submodule &&
echo "(1|2)d(3|4)" >submodule/a &&
git -C submodule add a &&
git -C submodule commit -m "add a" &&
git submodule add ./submodule &&
- git commit -m "added submodule"
+ git commit -m "added submodule" &&
+ test_tick
'
test_expect_success 'grep correctly finds patterns in a submodule' '
echo "(1|2)d(3|4)" >submodule/sub/a &&
git -C submodule/sub add a &&
git -C submodule/sub commit -m "add a" &&
+ test_tick &&
git -C submodule submodule add ./sub &&
git -C submodule add sub &&
git -C submodule commit -m "added sub" &&
+ test_tick &&
git add submodule &&
git commit -m "updated submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
a:(1|2)d(3|4)
echo "(1|2)d(3|4)" >"parent/fi:le" &&
git -C parent add "fi:le" &&
git -C parent commit -m "add fi:le" &&
+ test_tick &&
git init "su:b" &&
test_when_finished "rm -rf su:b" &&
echo "(1|2)d(3|4)" >"su:b/fi:le" &&
git -C "su:b" add "fi:le" &&
git -C "su:b" commit -m "add fi:le" &&
+ test_tick &&
git -C parent submodule add "../su:b" "su:b" &&
git -C parent commit -m "add submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
fi:le:(1|2)d(3|4)
echo "(1|2)d(3|4)" >parent/file &&
git -C parent add file &&
git -C parent commit -m "add file" &&
+ test_tick &&
git init sub &&
test_when_finished "rm -rf sub" &&
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git -C parent submodule add ../sub dir/sub &&
git -C parent commit -m "add submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
dir/sub/file:(1|2)d(3|4)
git -C parent mv dir/sub sub-moved &&
git -C parent commit -m "moved submodule" &&
+ test_tick &&
cat >expect <<-\EOF &&
file:(1|2)d(3|4)
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git init parent &&
echo "(1|2)d(3|4)" >parent/file &&
git -C parent add src/file2 &&
git -C parent submodule add ../sub &&
git -C parent commit -m "add files and submodule" &&
+ test_tick &&
# From top works
cat >expect <<-\EOF &&
echo "(1|2)d(3|4)" >sub/file &&
git -C sub add file &&
git -C sub commit -m "add file" &&
+ test_tick &&
git init parent &&
mkdir parent/src &&
git -C parent submodule add ../sub src/sub &&
git -C parent submodule add ../sub sub &&
git -C parent commit -m "add files and submodules" &&
+ test_tick &&
# Verify grep from root works
cat >expect <<-\EOF &&
test_cmp expect actual
'
+reset_and_clean () {
+ git reset --hard &&
+ git clean -fd &&
+ git submodule foreach --recursive 'git reset --hard' &&
+ git submodule foreach --recursive 'git clean -fd'
+}
+
+test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
+ reset_and_clean &&
+ echo "A modified line in submodule" >>submodule/a &&
+ echo "submodule/a:A modified line in submodule" >expect &&
+ git grep --recurse-submodules "A modified line in submodule" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
+ reset_and_clean &&
+ echo "A modified line in submodule" >>submodule/a &&
+ test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
+ test_must_be_empty actual
+'
test_done
grep "A U Thor" actual
'
+# Tests the splitting and merging of blame entries in blame_coalesce().
+# The output of blame is the same, regardless of whether blame_coalesce() runs
+# or not, so we'd likely only notice a problem if blame crashes or assigned
+# blame to the "splitting" commit ('SPLIT' below).
+test_expect_success 'blame coalesce' '
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "original file" &&
+ oid=$(git rev-parse HEAD) &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ SPLIT
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "interior SPLIT line" &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "same contents as original" &&
+
+ cat >expect <<-EOF &&
+ $oid 1) ABC
+ $oid 2) DEF
+ EOF
+ git -c core.abbrev=40 blame -s giraffe >actual &&
+ test_cmp expect actual
+'
+
test_done
--- /dev/null
+#!/bin/sh
+
+test_description='ignore revisions when blaming'
+. ./test-lib.sh
+
+# Creates:
+# A--B--X
+# A added line 1 and B added line 2. X makes changes to those lines. Sanity
+# check that X is blamed for both lines.
+test_expect_success setup '
+ test_commit A file line1 &&
+
+ echo line2 >>file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ test_write_lines line-one line-two >file &&
+ git add file &&
+ test_tick &&
+ git commit -m X &&
+ git tag X &&
+
+ git blame --line-porcelain file >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse X >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse X >expect &&
+ test_cmp expect actual
+ '
+
+# Ignore X, make sure A is blamed for line 1 and B for line 2.
+test_expect_success ignore_rev_changing_lines '
+ git blame --line-porcelain --ignore-rev X file >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# For ignored revs that have added 'unblamable' lines, attribute those to the
+# ignored commit.
+# A--B--X--Y
+# Where Y changes lines 1 and 2, and adds lines 3 and 4. The added lines ought
+# to have nothing in common with "line-one" or "line-two", to keep any
+# heuristics from matching them with any lines in the parent.
+test_expect_success ignore_rev_adding_unblamable_lines '
+ test_write_lines line-one-change line-two-changed y3 y4 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m Y &&
+ git tag Y &&
+
+ git rev-parse Y >expect &&
+ git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 3" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual
+ '
+
+# Ignore X and Y, both in separate files. Lines 1 == A, 2 == B.
+test_expect_success ignore_revs_from_files '
+ git rev-parse X >ignore_x &&
+ git rev-parse Y >ignore_y &&
+ git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# Ignore X from the config option, Y from a file.
+test_expect_success ignore_revs_from_configs_and_files '
+ git config --add blame.ignoreRevsFile ignore_x &&
+ git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse A >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual
+ '
+
+# Override blame.ignoreRevsFile (ignore_x) with an empty string. X should be
+# blamed now for lines 1 and 2, since we are no longer ignoring X.
+test_expect_success override_ignore_revs_file '
+ git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
+ git rev-parse X >expect &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+ test_cmp expect actual
+ '
+test_expect_success bad_files_and_revs '
+ test_must_fail git blame file --ignore-rev NOREV 2>err &&
+ test_i18ngrep "cannot find revision NOREV to ignore" err &&
+
+ test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
+ test_i18ngrep "could not open.*: NOFILE" err &&
+
+ echo NOREV >ignore_norev &&
+ test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
+ test_i18ngrep "invalid object name: NOREV" err
+ '
+
+# For ignored revs that have added 'unblamable' lines, mark those lines with a
+# '*'
+# A--B--X--Y
+# Lines 3 and 4 are from Y and unblamable. This was set up in
+# ignore_rev_adding_unblamable_lines.
+test_expect_success mark_unblamable_lines '
+ git config --add blame.markUnblamableLines true &&
+
+ git blame --ignore-rev Y file >blame_raw &&
+ echo "*" >expect &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual
+ '
+
+# Commit Z will touch the first two lines. Y touched all four.
+# A--B--X--Y--Z
+# The blame output when ignoring Z should be:
+# ?Y ... 1)
+# ?Y ... 2)
+# Y ... 3)
+# Y ... 4)
+# We're checking only the first character
+test_expect_success mark_ignored_lines '
+ git config --add blame.markIgnoredLines true &&
+
+ test_write_lines line-one-Z line-two-Z y3 y4 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m Z &&
+ git tag Z &&
+
+ git blame --ignore-rev Z file >blame_raw &&
+ echo "?" >expect &&
+
+ sed -n "1p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "2p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual
+ '
+
+# For ignored revs that added 'unblamable' lines and more recent commits changed
+# the blamable lines, mark the unblamable lines with a
+# '*'
+# A--B--X--Y--Z
+# Lines 3 and 4 are from Y and unblamable, as set up in
+# ignore_rev_adding_unblamable_lines. Z changed lines 1 and 2.
+test_expect_success mark_unblamable_lines_intermediate '
+ git config --add blame.markUnblamableLines true &&
+
+ git blame --ignore-rev Y file >blame_raw 2>stderr &&
+ echo "*" >expect &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual
+ '
+
+# The heuristic called by guess_line_blames() tries to find the size of a
+# blame_entry 'e' in the parent's address space. Those calculations need to
+# check for negative or zero values for when a blame entry is completely outside
+# the window of the parent's version of a file.
+#
+# This happens when one commit adds several lines (commit B below). A later
+# commit (C) changes one line in the middle of B's change. Commit C gets blamed
+# for its change, and that breaks up B's change into multiple blame entries.
+# When processing B, one of the blame_entries is outside A's window (which was
+# zero - it had no lines added on its side of the diff).
+#
+# A--B--C, ignore B to test the ignore heuristic's boundary checks.
+test_expect_success ignored_chunk_negative_parent_size '
+ rm -rf .git/ &&
+ git init &&
+
+ test_write_lines L1 L2 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m A &&
+ git tag A &&
+
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m C &&
+ git tag C &&
+
+ git blame file --ignore-rev B >blame_raw
+ '
+
+# Resetting the repo and creating:
+#
+# A--B--M
+# \ /
+# C-+
+#
+# 'A' creates a file. B changes line 1, and C changes line 9. M merges.
+test_expect_success ignore_merge '
+ rm -rf .git/ &&
+ git init &&
+
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m A &&
+ git tag A &&
+
+ test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+ git add file &&
+ test_tick &&
+ git commit -m B &&
+ git tag B &&
+
+ git reset --hard A &&
+ test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
+ git add file &&
+ test_tick &&
+ git commit -m C &&
+ git tag C &&
+
+ test_merge M B &&
+ git blame --line-porcelain file --ignore-rev M >blame_raw &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse B >expect &&
+ test_cmp expect actual &&
+
+ grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual &&
+ git rev-parse C >expect &&
+ test_cmp expect actual
+ '
+
+test_done
--- /dev/null
+#!/bin/sh
+
+test_description='git blame ignore fuzzy heuristic'
+. ./test-lib.sh
+
+pick_author='s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/'
+
+# Each test is composed of 4 variables:
+# titleN - the test name
+# aN - the initial content
+# bN - the final content
+# expectedN - the line numbers from aN that we expect git blame
+# on bN to identify, or "Final" if bN itself should
+# be identified as the origin of that line.
+
+# We start at test 2 because setup will show as test 1
+title2="Regression test for partially overlapping search ranges"
+cat <<EOF >a2
+1
+2
+3
+abcdef
+5
+6
+7
+ijkl
+9
+10
+11
+pqrs
+13
+14
+15
+wxyz
+17
+18
+19
+EOF
+cat <<EOF >b2
+abcde
+ijk
+pqr
+wxy
+EOF
+cat <<EOF >expected2
+4
+8
+12
+16
+EOF
+
+title3="Combine 3 lines into 2"
+cat <<EOF >a3
+if ((maxgrow==0) ||
+ ( single_line_field && (field->dcols < maxgrow)) ||
+ (!single_line_field && (field->drows < maxgrow)))
+EOF
+cat <<EOF >b3
+if ((maxgrow == 0) || (single_line_field && (field->dcols < maxgrow)) ||
+ (!single_line_field && (field->drows < maxgrow))) {
+EOF
+cat <<EOF >expected3
+2
+3
+EOF
+
+title4="Add curly brackets"
+cat <<EOF >a4
+ if (rows) *rows = field->rows;
+ if (cols) *cols = field->cols;
+ if (frow) *frow = field->frow;
+ if (fcol) *fcol = field->fcol;
+EOF
+cat <<EOF >b4
+ if (rows) {
+ *rows = field->rows;
+ }
+ if (cols) {
+ *cols = field->cols;
+ }
+ if (frow) {
+ *frow = field->frow;
+ }
+ if (fcol) {
+ *fcol = field->fcol;
+ }
+EOF
+cat <<EOF >expected4
+1
+1
+Final
+2
+2
+Final
+3
+3
+Final
+4
+4
+Final
+EOF
+
+
+title5="Combine many lines and change case"
+cat <<EOF >a5
+for(row=0,pBuffer=field->buf;
+ row<height;
+ row++,pBuffer+=width )
+{
+ if ((len = (int)( After_End_Of_Data( pBuffer, width ) - pBuffer )) > 0)
+ {
+ wmove( win, row, 0 );
+ waddnstr( win, pBuffer, len );
+EOF
+cat <<EOF >b5
+for (Row = 0, PBuffer = field->buf; Row < Height; Row++, PBuffer += Width) {
+ if ((Len = (int)(afterEndOfData(PBuffer, Width) - PBuffer)) > 0) {
+ wmove(win, Row, 0);
+ waddnstr(win, PBuffer, Len);
+EOF
+cat <<EOF >expected5
+1
+5
+7
+8
+EOF
+
+title6="Rename and combine lines"
+cat <<EOF >a6
+bool need_visual_update = ((form != (FORM *)0) &&
+ (form->status & _POSTED) &&
+ (form->current==field));
+
+if (need_visual_update)
+ Synchronize_Buffer(form);
+
+if (single_line_field)
+{
+ growth = field->cols * amount;
+ if (field->maxgrow)
+ growth = Minimum(field->maxgrow - field->dcols,growth);
+ field->dcols += growth;
+ if (field->dcols == field->maxgrow)
+EOF
+cat <<EOF >b6
+bool NeedVisualUpdate = ((Form != (FORM *)0) && (Form->status & _POSTED) &&
+ (Form->current == field));
+
+if (NeedVisualUpdate) {
+ synchronizeBuffer(Form);
+}
+
+if (SingleLineField) {
+ Growth = field->cols * amount;
+ if (field->maxgrow) {
+ Growth = Minimum(field->maxgrow - field->dcols, Growth);
+ }
+ field->dcols += Growth;
+ if (field->dcols == field->maxgrow) {
+EOF
+cat <<EOF >expected6
+1
+3
+4
+5
+6
+Final
+7
+8
+10
+11
+12
+Final
+13
+14
+EOF
+
+# Both lines match identically so position must be used to tie-break.
+title7="Same line twice"
+cat <<EOF >a7
+abc
+abc
+EOF
+cat <<EOF >b7
+abcd
+abcd
+EOF
+cat <<EOF >expected7
+1
+2
+EOF
+
+title8="Enforce line order"
+cat <<EOF >a8
+abcdef
+ghijkl
+ab
+EOF
+cat <<EOF >b8
+ghijk
+abcd
+EOF
+cat <<EOF >expected8
+2
+3
+EOF
+
+title9="Expand lines and rename variables"
+cat <<EOF >a9
+int myFunction(int ArgumentOne, Thing *ArgTwo, Blah XuglyBug) {
+ Squiggle FabulousResult = squargle(ArgumentOne, *ArgTwo,
+ XuglyBug) + EwwwGlobalWithAReallyLongNameYepTooLong;
+ return FabulousResult * 42;
+}
+EOF
+cat <<EOF >b9
+int myFunction(int argument_one, Thing *arg_asdfgh,
+ Blah xugly_bug) {
+ Squiggle fabulous_result = squargle(argument_one,
+ *arg_asdfgh, xugly_bug)
+ + g_ewww_global_with_a_really_long_name_yep_too_long;
+ return fabulous_result * 42;
+}
+EOF
+cat <<EOF >expected9
+1
+1
+2
+3
+3
+4
+5
+EOF
+
+title10="Two close matches versus one less close match"
+cat <<EOF >a10
+abcdef
+abcdef
+ghijkl
+EOF
+cat <<EOF >b10
+gh
+abcdefx
+EOF
+cat <<EOF >expected10
+Final
+2
+EOF
+
+# The first line of b matches best with the last line of a, but the overall
+# match is better if we match it with the the first line of a.
+title11="Piggy in the middle"
+cat <<EOF >a11
+abcdefg
+ijklmn
+abcdefgh
+EOF
+cat <<EOF >b11
+abcdefghx
+ijklm
+EOF
+cat <<EOF >expected11
+1
+2
+EOF
+
+title12="No trailing newline"
+printf "abc\ndef" >a12
+printf "abx\nstu" >b12
+cat <<EOF >expected12
+1
+Final
+EOF
+
+title13="Reorder includes"
+cat <<EOF >a13
+#include "c.h"
+#include "b.h"
+#include "a.h"
+#include "e.h"
+#include "d.h"
+EOF
+cat <<EOF >b13
+#include "a.h"
+#include "b.h"
+#include "c.h"
+#include "d.h"
+#include "e.h"
+EOF
+cat <<EOF >expected13
+3
+2
+1
+5
+4
+EOF
+
+last_test=13
+
+test_expect_success setup '
+ for i in $(test_seq 2 $last_test)
+ do
+ # Append each line in a separate commit to make it easy to
+ # check which original line the blame output relates to.
+
+ line_count=0 &&
+ while IFS= read line
+ do
+ line_count=$((line_count+1)) &&
+ echo "$line" >>"$i" &&
+ git add "$i" &&
+ test_tick &&
+ GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count"
+ done <"a$i"
+ done &&
+
+ for i in $(test_seq 2 $last_test)
+ do
+ # Overwrite the files with the final content.
+ cp b$i $i &&
+ git add $i
+ done &&
+ test_tick &&
+
+ # Commit the final content all at once so it can all be
+ # referred to with the same commit ID.
+ GIT_AUTHOR_NAME=Final git commit -m Final &&
+
+ IGNOREME=$(git rev-parse HEAD)
+'
+
+for i in $(test_seq 2 $last_test); do
+ eval title="\$title$i"
+ test_expect_success "$title" \
+ "git blame -M9 --ignore-rev $IGNOREME $i >output &&
+ sed -e \"$pick_author\" output >actual &&
+ test_cmp expected$i actual"
+done
+
+# This invoked a null pointer dereference when the chunk callback was called
+# with a zero length parent chunk and there were no more suspects.
+test_expect_success 'Diff chunks with no suspects' '
+ test_write_lines xy1 A B C xy1 >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines xy2 A B xy2 C xy2 >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+ REV_2=$(git rev-parse HEAD) &&
+
+ test_write_lines xy3 A >file &&
+ git add file &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+ REV_3=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 1 >expected &&
+
+ git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+test_expect_success 'position matching' '
+ test_write_lines abc def >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines abc def abc def >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+ test_write_lines abcx defx abcx defx >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+ REV_3=$(git rev-parse HEAD) &&
+
+ test_write_lines abcy defy abcx defx >file2 &&
+ git add file2 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=4 git commit -m 4 &&
+ REV_4=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 1 2 2 >expected &&
+
+ git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+# This fails if each blame entry is processed independently instead of
+# processing each diff change in full.
+test_expect_success 'preserve order' '
+ test_write_lines bcde >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+ test_write_lines bcde fghij >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+ test_write_lines bcde fghij abcd >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=3 git commit -m 3 &&
+
+ test_write_lines abcdx fghijx bcdex >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=4 git commit -m 4 &&
+ REV_4=$(git rev-parse HEAD) &&
+
+ test_write_lines abcdx fghijy bcdex >file3 &&
+ git add file3 &&
+ test_tick &&
+ GIT_AUTHOR_NAME=5 git commit -m 5 &&
+ REV_5=$(git rev-parse HEAD) &&
+
+ test_write_lines 1 2 3 >expected &&
+
+ git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
+ sed -e "$pick_author" output >actual &&
+
+ test_cmp expected actual
+ '
+
+test_done
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--no-thread \
- $patches $patches >stdout &&
+ $patches >stdout &&
! grep "In-Reply-To: " stdout
'
git send-email \
--dry-run \
--from="Example <nobody@example.com>" \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "To: Somebody <somebody@ex.com>" stdout
'
+test_expect_success $PREREQ 'setup sendemail.identity' '
+ git config --replace-all sendemail.to "default@example.com" &&
+ git config --replace-all sendemail.isp.to "isp@example.com" &&
+ git config --replace-all sendemail.cloud.to "cloud@example.com"
+'
+
+test_expect_success $PREREQ 'sendemail.identity: reads the correct identity config' '
+ git -c sendemail.identity=cloud send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: identity overrides sendemail.identity' '
+ git -c sendemail.identity=cloud send-email \
+ --identity=isp \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: isp@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: --no-identity clears previous identity' '
+ git -c sendemail.identity=cloud send-email \
+ --no-identity \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: default@example.com" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: bool identity variable existance overrides' '
+ git -c sendemail.identity=cloud \
+ -c sendemail.xmailer=true \
+ -c sendemail.cloud.xmailer=false \
+ send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout &&
+ ! grep "X-Mailer" stdout
+'
+
+test_expect_success $PREREQ 'sendemail.identity: bool variable fallback' '
+ git -c sendemail.identity=cloud \
+ -c sendemail.xmailer=false \
+ send-email \
+ --dry-run \
+ --from="nobody@example.com" \
+ $patches >stdout &&
+ grep "To: cloud@example.com" stdout &&
+ ! grep "X-Mailer" stdout
+'
+
test_expect_success $PREREQ '--no-to overrides sendemail.to' '
git send-email \
--dry-run \
--from="Example <nobody@example.com>" \
--no-to \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "To: nobody@example.com" stdout &&
! grep "To: Somebody <somebody@ex.com>" stdout
'
--dry-run \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "Cc: Somebody <somebody@ex.com>" stdout
'
--no-cc \
--cc=bodies@example.com \
--to=nobody@example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "Cc: bodies@example.com" stdout &&
! grep "Cc: Somebody <somebody@ex.com>" stdout
'
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server relay.example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "RCPT TO:<other@ex.com>" stdout
'
--bcc=bodies@example.com \
--to=nobody@example.com \
--smtp-server relay.example.com \
- $patches $patches >stdout &&
+ $patches >stdout &&
grep "RCPT TO:<bodies@example.com>" stdout &&
! grep "RCPT TO:<other@ex.com>" stdout
'
EOF
'
-test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
+test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
clean_fake_sendmail &&
- git config sendemail.transferEncoding 7bit &&
- test_must_fail git send-email \
+ test_must_fail git -c sendemail.transferEncoding=8bit \
+ send-email \
--transfer-encoding=7bit \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
test -z "$(ls msgtxt*)"
'
-test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
+test_expect_success $PREREQ 'sendemail.transferEncoding via config' '
clean_fake_sendmail &&
- git config sendemail.transferEncoding 8bit &&
- test_must_fail git send-email \
- --transfer-encoding=7bit \
+ test_must_fail git -c sendemail.transferEncoding=7bit \
+ send-email \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
test -z "$(ls msgtxt*)"
'
-test_expect_success $PREREQ 'sendemail.transferencoding=8bit' '
+test_expect_success $PREREQ 'sendemail.transferEncoding via cli' '
clean_fake_sendmail &&
- git send-email \
- --transfer-encoding=8bit \
+ test_must_fail git send-email \
+ --transfer-encoding=7bit \
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
- sed '1,/^$/d' email-using-8bit >expected &&
- test_cmp expected actual
+ grep "cannot send message as 7bit" errors &&
+ test -z "$(ls msgtxt*)"
'
test_expect_success $PREREQ 'setup expect' '
test_must_fail git send-email --dump-aliases --to=janice@example.com -1 refs/heads/accounting
'
+test_expect_success $PREREQ 'aliases and sendemail.identity' '
+ test_must_fail git \
+ -c sendemail.identity=cloud \
+ -c sendemail.aliasesfile=default-aliases \
+ -c sendemail.cloud.aliasesfile=cloud-aliases \
+ send-email -1 2>stderr &&
+ test_i18ngrep "cloud-aliases" stderr
+'
+
test_sendmail_aliases () {
msg="$1" && shift &&
expect="$@" &&
sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import
'
+###
+### series X (other new features)
+###
+
+test_expect_success 'X: handling encoding' '
+ test_tick &&
+ cat >input <<-INPUT_END &&
+ commit refs/heads/encoding
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ encoding iso-8859-7
+ data <<COMMIT
+ INPUT_END
+
+ printf "Pi: \360\nCOMMIT\n" >>input &&
+
+ git fast-import <input &&
+ git cat-file -p encoding | grep $(printf "\360") &&
+ git log -1 --format=%B encoding | grep $(printf "\317\200")
+'
+
test_done
test $MUSS = $(git rev-parse --verify refs/tags/muss)
'
-test_expect_success 'iso-8859-1' '
+test_expect_success 'reencoding iso-8859-7' '
- git config i18n.commitencoding ISO8859-1 &&
- # use author and committer name in ISO-8859-1 to match it.
- . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
test_tick &&
echo rosten >file &&
- git commit -s -m den file &&
- git fast-export wer^..wer >iso8859-1.fi &&
- sed "s/wer/i18n/" iso8859-1.fi |
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n/" iso-8859-7.fi |
(cd new &&
git fast-import &&
+ # The commit object, if not re-encoded, would be 240 bytes.
+ # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
+ # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
+ # to \xCF\x80 (\317\200) in UTF-8 adds a byte. Check for
+ # the expected size.
+ test 221 -eq "$(git cat-file -s i18n)" &&
+ # ...and for the expected translation of bytes.
git cat-file commit i18n >actual &&
- grep "Áéí óú" actual)
+ grep $(printf "\317\200") actual &&
+ # Also make sure the commit does not have the "encoding" header
+ ! grep ^encoding actual)
+'
+
+test_expect_success 'aborting on iso-8859-7' '
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
'
+
+test_expect_success 'preserving iso-8859-7' '
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
+ (cd new &&
+ git fast-import &&
+ # The commit object, if not re-encoded, is 240 bytes.
+ # Removing the "encoding iso-8859-7\n" header would drops 20
+ # bytes. Re-encoding the Pi character from \xF0 (\360) in
+ # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
+ # Check for the expected size...
+ test 240 -eq "$(git cat-file -s i18n-no-recoding)" &&
+ # ...as well as the expected byte.
+ git cat-file commit i18n-no-recoding >actual &&
+ grep $(printf "\360") actual &&
+ # Also make sure the commit has the "encoding" header
+ grep ^encoding actual)
+'
+
+test_expect_success 'encoding preserved if reencoding fails' '
+
+ test_when_finished "git reset --hard HEAD~1" &&
+ test_config i18n.commitencoding iso-8859-7 &&
+ echo rosten >file &&
+ git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
+ git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+ sed "s/wer/i18n-invalid/" iso-8859-7.fi |
+ (cd new &&
+ git fast-import &&
+ git cat-file commit i18n-invalid >actual &&
+ # Make sure the commit still has the encoding header
+ grep ^encoding actual &&
+ # Verify that the commit has the expected size; i.e.
+ # that no bytes were re-encoded to a different encoding.
+ test 252 -eq "$(git cat-file -s i18n-invalid)" &&
+ # ...and check for the original special bytes
+ grep $(printf "\360") actual &&
+ grep $(printf "\377") actual)
+'
+
test_expect_success 'import/export-marks' '
git checkout -b marks master &&
test_expect_success 'setup copies' '
- git config --unset i18n.commitencoding &&
git checkout -b copy rein &&
git mv file file3 &&
git commit -m move1 &&
--- /dev/null
+Pi: ð; Invalid: ÿ
\ No newline at end of file
--- /dev/null
+Pi: ð
\ No newline at end of file
)
'
+# Check that excluded files are omitted during import
+test_expect_success 'git p4 clone complex branches with excluded files' '
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList branch1:branch2 &&
+ git config --add git-p4.branchList branch1:branch3 &&
+ git config --add git-p4.branchList branch1:branch4 &&
+ git config --add git-p4.branchList branch1:branch5 &&
+ git config --add git-p4.branchList branch1:branch6 &&
+ git p4 clone --dest=. --detect-branches -//depot/branch1/file2 -//depot/branch2/file2 -//depot/branch3/file2 -//depot/branch4/file2 -//depot/branch5/file2 -//depot/branch6/file2 //depot@all &&
+ git log --all --graph --decorate --stat &&
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch2 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3 &&
+ git reset --hard p4/depot/branch3 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3 &&
+ git reset --hard p4/depot/branch4 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch5 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_file file3 &&
+ git reset --hard p4/depot/branch6 &&
+ test_path_is_file file1 &&
+ test_path_is_missing file2 &&
+ test_path_is_missing file3
+ )
+'
+
# From a report in http://stackoverflow.com/questions/11893688
# where --use-client-spec caused branch prefixes not to be removed;
# every file in git appeared into a subdirectory of the branch name.
)
'
+test_expect_success 'restart p4d (case folding enabled)' '
+ stop_and_cleanup_p4d &&
+ start_p4d -C1
+'
+
+#
+# 1: //depot/main/mf1
+# 2: integrate //depot/main/... -> //depot/branch1/...
+# 3: //depot/main/mf2
+# 4: //depot/BRANCH1/B1f3
+# 5: //depot/branch1/b1f4
+#
+test_expect_success !CASE_INSENSITIVE_FS 'basic p4 branches for case folding' '
+ (
+ cd "$cli" &&
+ mkdir -p main &&
+
+ echo mf1 >main/mf1 &&
+ p4 add main/mf1 &&
+ p4 submit -d "main/mf1" &&
+
+ p4 integrate //depot/main/... //depot/branch1/... &&
+ p4 submit -d "integrate main to branch1" &&
+
+ echo mf2 >main/mf2 &&
+ p4 add main/mf2 &&
+ p4 submit -d "main/mf2" &&
+
+ mkdir BRANCH1 &&
+ echo B1f3 >BRANCH1/B1f3 &&
+ p4 add BRANCH1/B1f3 &&
+ p4 submit -d "BRANCH1/B1f3" &&
+
+ echo b1f4 >branch1/b1f4 &&
+ p4 add branch1/b1f4 &&
+ p4 submit -d "branch1/b1f4"
+ )
+'
+
+# Check that files are properly split across branches when ignorecase is set
+test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone, branchList branch definition, ignorecase' '
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList main:branch1 &&
+ git config --type=bool core.ignoreCase true &&
+ git p4 clone --dest=. --detect-branches //depot@all &&
+
+ git log --all --graph --decorate --stat &&
+
+ git reset --hard p4/master &&
+ test_path_is_file mf1 &&
+ test_path_is_file mf2 &&
+ test_path_is_missing B1f3 &&
+ test_path_is_missing b1f4 &&
+
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file mf1 &&
+ test_path_is_missing mf2 &&
+ test_path_is_file B1f3 &&
+ test_path_is_file b1f4
+ )
+'
+
+# Check that files are properly split across branches when ignorecase is set, use-client-spec case
+test_expect_success !CASE_INSENSITIVE_FS 'git p4 clone with client-spec, branchList branch definition, ignorecase' '
+ client_view "//depot/... //client/..." &&
+ test_when_finished cleanup_git &&
+ test_create_repo "$git" &&
+ (
+ cd "$git" &&
+ git config git-p4.branchList main:branch1 &&
+ git config --type=bool core.ignoreCase true &&
+ git p4 clone --dest=. --use-client-spec --detect-branches //depot@all &&
+
+ git log --all --graph --decorate --stat &&
+
+ git reset --hard p4/master &&
+ test_path_is_file mf1 &&
+ test_path_is_file mf2 &&
+ test_path_is_missing B1f3 &&
+ test_path_is_missing b1f4 &&
+
+ git reset --hard p4/depot/branch1 &&
+ test_path_is_file mf1 &&
+ test_path_is_missing mf2 &&
+ test_path_is_file B1f3 &&
+ test_path_is_file b1f4
+ )
+'
+
test_done
mkdir -p wanted discard &&
echo wanted >wanted/foo &&
echo discard >discard/foo &&
- p4 add wanted/foo discard/foo &&
+ echo discard_file >discard_file &&
+ echo discard_file_not >discard_file_not &&
+ p4 add wanted/foo discard/foo discard_file discard_file_not &&
p4 submit -d "initial revision"
)
'
(
cd "$git" &&
test_path_is_file wanted/foo &&
- test_path_is_file discard/foo
+ test_path_is_file discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
)
'
(
cd "$git" &&
test_path_is_file wanted/foo &&
- test_path_is_missing discard/foo
+ test_path_is_missing discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
+ )
+'
+
+test_expect_success 'clone, excluding single file, no trailing /' '
+ test_when_finished cleanup_git &&
+ git p4 clone -//depot/discard_file --dest="$git" //depot/...@all &&
+ (
+ cd "$git" &&
+ test_path_is_file wanted/foo &&
+ test_path_is_file discard/foo &&
+ test_path_is_missing discard_file &&
+ test_path_is_file discard_file_not
)
'
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
(
cd "$cli" &&
- p4 edit wanted/foo discard/foo &&
+ p4 edit wanted/foo discard/foo discard_file_not &&
date >>wanted/foo &&
date >>discard/foo &&
+ date >>discard_file_not &&
p4 submit -d "updating" &&
cd "$git" &&
git p4 sync -//depot/discard/... &&
test_path_is_file wanted/foo &&
- test_path_is_missing discard/foo
+ test_path_is_missing discard/foo &&
+ test_path_is_file discard_file &&
+ test_path_is_file discard_file_not
+ )
+'
+
+test_expect_success 'clone, then sync with exclude, no trailing /' '
+ test_when_finished cleanup_git &&
+ git p4 clone -//depot/discard/... -//depot/discard_file --dest="$git" //depot/...@all &&
+ (
+ cd "$cli" &&
+ p4 edit wanted/foo discard/foo discard_file_not &&
+ date >>wanted/foo &&
+ date >>discard/foo &&
+ date >>discard_file_not &&
+ p4 submit -d "updating" &&
+
+ cd "$git" &&
+ git p4 sync -//depot/discard/... -//depot/discard_file &&
+ test_path_is_file wanted/foo &&
+ test_path_is_missing discard/foo &&
+ test_path_is_missing discard_file &&
+ test_path_is_file discard_file_not
)
'
'
done
+test_expect_success 'git config - section' '
+ test_completion "git config br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git config - variable name' '
+ test_completion "git config log.d" <<-\EOF
+ log.date Z
+ log.decorate Z
+ EOF
+'
+
+test_expect_success 'git config - value' '
+ test_completion "git config color.pager " <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
+test_expect_success 'git -c - section' '
+ test_completion "git -c br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git -c - variable name' '
+ test_completion "git -c log.d" <<-\EOF
+ log.date=Z
+ log.decorate=Z
+ EOF
+'
+
+test_expect_success 'git -c - value' '
+ test_completion "git -c color.pager=" <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - section' '
+ test_completion "git clone --config=br" <<-\EOF
+ branch.Z
+ browser.Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - variable name' '
+ test_completion "git clone --config=log.d" <<-\EOF
+ log.date=Z
+ log.decorate=Z
+ EOF
+'
+
+test_expect_success 'git clone --config= - value' '
+ test_completion "git clone --config=color.pager=" <<-\EOF
+ false Z
+ true Z
+ EOF
+'
+
test_expect_success 'sourcing the completion script clears cached commands' '
__git_compute_all_commands &&
verbose test -n "$__git_all_commands" &&
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
- GIT_TEST_GETTEXT_POISON= &&
+ GIT_TEST_GETTEXT_POISON=false &&
__git_compute_merge_strategies &&
verbose test -n "$__git_merge_strategies" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
test_expect_success 'prompt - cherry-pick' '
printf " (master|CHERRY-PICKING)" >expected &&
- test_must_fail git cherry-pick b1 &&
- test_when_finished "git reset --hard" &&
+ test_must_fail git cherry-pick b1 b1^ &&
+ test_when_finished "git cherry-pick --abort" &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual" &&
+ git reset --merge &&
+ test_must_fail git rev-parse CHERRY_PICK_HEAD &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - revert' '
+ printf " (master|REVERTING)" >expected &&
+ test_must_fail git revert b1^ b1 &&
+ test_when_finished "git revert --abort" &&
+ __git_ps1 >"$actual" &&
+ test_cmp expected "$actual" &&
+ git reset --merge &&
+ test_must_fail git rev-parse REVERT_HEAD &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
git tag "$1"
}
+# Efficiently create <nr> commits, each with a unique number (from 1 to <nr>
+# by default) in the commit message.
+#
+# Usage: test_commit_bulk [options] <nr>
+# -C <dir>:
+# Run all git commands in directory <dir>
+# --ref=<n>:
+# ref on which to create commits (default: HEAD)
+# --start=<n>:
+# number commit messages from <n> (default: 1)
+# --message=<msg>:
+# use <msg> as the commit mesasge (default: "commit %s")
+# --filename=<fn>:
+# modify <fn> in each commit (default: %s.t)
+# --contents=<string>:
+# place <string> in each file (default: "content %s")
+# --id=<string>:
+# shorthand to use <string> and %s in message, filename, and contents
+#
+# The message, filename, and contents strings are evaluated by printf, with the
+# first "%s" replaced by the current commit number. So you can do:
+#
+# test_commit_bulk --filename=file --contents="modification %s"
+#
+# to have every commit touch the same file, but with unique content.
+#
+test_commit_bulk () {
+ tmpfile=.bulk-commit.input
+ indir=.
+ ref=HEAD
+ n=1
+ message='commit %s'
+ filename='%s.t'
+ contents='content %s'
+ while test $# -gt 0
+ do
+ case "$1" in
+ -C)
+ indir=$2
+ shift
+ ;;
+ --ref=*)
+ ref=${1#--*=}
+ ;;
+ --start=*)
+ n=${1#--*=}
+ ;;
+ --message=*)
+ message=${1#--*=}
+ ;;
+ --filename=*)
+ filename=${1#--*=}
+ ;;
+ --contents=*)
+ contents=${1#--*=}
+ ;;
+ --id=*)
+ message="${1#--*=} %s"
+ filename="${1#--*=}-%s.t"
+ contents="${1#--*=} %s"
+ ;;
+ -*)
+ BUG "invalid test_commit_bulk option: $1"
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done
+ total=$1
+
+ add_from=
+ if git -C "$indir" rev-parse --verify "$ref"
+ then
+ add_from=t
+ fi
+
+ while test "$total" -gt 0
+ do
+ test_tick &&
+ echo "commit $ref"
+ printf 'author %s <%s> %s\n' \
+ "$GIT_AUTHOR_NAME" \
+ "$GIT_AUTHOR_EMAIL" \
+ "$GIT_AUTHOR_DATE"
+ printf 'committer %s <%s> %s\n' \
+ "$GIT_COMMITTER_NAME" \
+ "$GIT_COMMITTER_EMAIL" \
+ "$GIT_COMMITTER_DATE"
+ echo "data <<EOF"
+ printf "$message\n" $n
+ echo "EOF"
+ if test -n "$add_from"
+ then
+ echo "from $ref^0"
+ add_from=
+ fi
+ printf "M 644 inline $filename\n" $n
+ echo "data <<EOF"
+ printf "$contents\n" $n
+ echo "EOF"
+ echo
+ n=$((n + 1))
+ total=$((total - 1))
+ done >"$tmpfile"
+
+ git -C "$indir" \
+ -c fastimport.unpacklimit=0 \
+ fast-import <"$tmpfile" || return 1
+
+ # This will be left in place on failure, which may aid debugging.
+ rm -f "$tmpfile"
+
+ # If we updated HEAD, then be nice and update the index and working
+ # tree, too.
+ if test "$ref" = "HEAD"
+ then
+ git -C "$indir" checkout -f HEAD || return 1
+ fi
+
+}
+
# This function helps systems where core.filemode=false is set.
# Use it instead of plain 'chmod +x' to set or unset the executable bit
# of a file in the working directory and add it to the index.
}
test_set_prereq () {
+ if test -n "$GIT_TEST_FAIL_PREREQS_INTERNAL"
+ then
+ case "$1" in
+ # The "!" case is handled below with
+ # test_unset_prereq()
+ !*)
+ ;;
+ # (Temporary?) whitelist of things we can't easily
+ # pretend not to support
+ SYMLINKS)
+ ;;
+ # Inspecting whether GIT_TEST_FAIL_PREREQS is on
+ # should be unaffected.
+ FAIL_PREREQS)
+ ;;
+ *)
+ return
+ esac
+ fi
+
case "$1" in
!*)
test_unset_prereq "${1#!}"
export test_prereq
if ! test_skip "$@"
then
- say >&3 "checking known breakage: $2"
+ say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2" expecting_failure
then
test_known_broken_ok_ "$1"
export test_prereq
if ! test_skip "$@"
then
- say >&3 "expecting success: $2"
+ say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2"
if test_run_ "$2"
then
test_ok_ "$1"
command "$PERL_PATH" "$@" 2>&7
} 7>&2 2>&4
-# Is the value one of the various ways to spell a boolean true/false?
-test_normalize_bool () {
- git -c magic.variable="$1" config --bool magic.variable 2>/dev/null
-}
-
-# Given a variable $1, normalize the value of it to one of "true",
-# "false", or "auto" and store the result to it.
-#
-# test_tristate GIT_TEST_HTTPD
-#
-# A variable set to an empty string is set to 'false'.
-# A variable set to 'false' or 'auto' keeps its value.
-# Anything else is set to 'true'.
-# An unset variable defaults to 'auto'.
-#
-# The last rule is to allow people to set the variable to an empty
-# string and export it to decline testing the particular feature
-# for versions both before and after this change. We used to treat
-# both unset and empty variable as a signal for "do not test" and
-# took any non-empty string as "please test".
-
-test_tristate () {
- if eval "test x\"\${$1+isset}\" = xisset"
- then
- # explicitly set
- eval "
- case \"\$$1\" in
- '') $1=false ;;
- auto) ;;
- *) $1=\$(test_normalize_bool \$$1 || echo true) ;;
- esac
- "
- else
- eval "$1=auto"
- fi
-}
-
# Exit the test suite, either by skipping all remaining tests or by
-# exiting with an error. If "$1" is "auto", we then we assume we were
-# opportunistically trying to set up some tests and we skip. If it is
-# "true", then we report a failure.
+# exiting with an error. If our prerequisite variable $1 falls back
+# on a default assume we were opportunistically trying to set up some
+# tests and we skip. If it is explicitly "true", then we report a failure.
#
# The error/skip message should be given by $2.
#
test_skip_or_die () {
- case "$1" in
- auto)
+ if ! git env--helper --type=bool --default=false --exit-code $1
+ then
skip_all=$2
test_done
- ;;
- true)
- error "$2"
- ;;
- *)
- error "BUG: test tristate is '$1' (real error: $2)"
- esac
+ fi
+ error "$2"
}
# The following mingw_* functions obey POSIX shell syntax, but are actually
eval "printf '%s' \"\${$var}\""
}
+# Insert a slash into an object ID so it can be used to reference a location
+# under ".git/objects". For example, "deadbeef..." becomes "de/adbeef..".
+test_oid_to_path () {
+ local basename=${1#??}
+ echo "${1%$basename}/$basename"
+}
+
# Choose a port number based on the test script's number and store it in
# the given variable name, unless that variable already contains a number.
test_set_port () {
TEST_STRESS_JOB_SFX="${GIT_TEST_STRESS_JOB_NR:+.stress-$GIT_TEST_STRESS_JOB_NR}"
TEST_NAME="$(basename "$0" .sh)"
+TEST_NUMBER="${TEST_NAME%%-*}"
+TEST_NUMBER="${TEST_NUMBER#t}"
TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results"
TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX"
TRASH_DIRECTORY="trash directory.$TEST_NAME$TEST_STRESS_JOB_SFX"
my @env = keys %ENV;
my $ok = join("|", qw(
TRACE
- TR2_
DEBUG
TEST
.*_TEST
done
}
+# The GIT_TEST_FAIL_PREREQS code hooks into test_set_prereq(), and
+# thus needs to be set up really early, and set an internal variable
+# for convenience so the hot test_set_prereq() codepath doesn't need
+# to call "git env--helper". Only do that work if needed by seeing if
+# GIT_TEST_FAIL_PREREQS is set at all.
+GIT_TEST_FAIL_PREREQS_INTERNAL=
+if test -n "$GIT_TEST_FAIL_PREREQS"
+then
+ if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+ then
+ GIT_TEST_FAIL_PREREQS_INTERNAL=true
+ test_set_prereq FAIL_PREREQS
+ fi
+else
+ test_lazy_prereq FAIL_PREREQS '
+ git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+ '
+fi
+
# Fix some commands on Windows
uname_s=$(uname -s)
case $uname_s in
unset GIT_TEST_GETTEXT_POISON_ORIG
fi
-# Can we rely on git's output in the C locale?
-if test -z "$GIT_TEST_GETTEXT_POISON"
-then
- test_set_prereq C_LOCALE_OUTPUT
-fi
+test_lazy_prereq C_LOCALE_OUTPUT '
+ ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON
+'
if test -z "$GIT_TEST_CHECK_CACHE_TREE"
then
struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_tag_node(r));
+ return create_object(r, oid, alloc_tag_node(r));
return object_as_type(r, obj, OBJ_TAG, 0);
}
--- /dev/null
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit"
+:
if (!trace_want(key))
return 0;
- set_try_to_free_routine(NULL); /* is never reset */
-
/* unit tests may want to disable additional trace output */
if (trace_want(&trace_bare))
return 1;
static void tr2_dst_malformed_warning(struct tr2_dst *dst,
const char *tgt_value)
{
- struct strbuf buf = STRBUF_INIT;
-
- strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'",
- tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
- warning("%s", buf.buf);
-
- strbuf_release(&buf);
+ warning("trace2: unknown value for '%s': '%s'",
+ tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
}
int tr2_dst_get_trace_fd(struct tr2_dst *dst)
check_connectivity : 1,
no_disconnect_req : 1,
no_private_update : 1;
+
+ /*
+ * As an optimization, the transport code may invoke fetch before
+ * get_refs_list. If this happens, and if the transport helper doesn't
+ * support connect or stateless_connect, we need to invoke
+ * get_refs_list ourselves if we haven't already done so. Keep track of
+ * whether we have invoked get_refs_list.
+ */
+ unsigned get_refs_list_called : 1;
+
char *export_marks;
char *import_marks;
/* These go from remote name (as in "list") to private name */
return 0;
}
+static struct ref *get_refs_list_using_list(struct transport *transport,
+ int for_push);
+
static int fetch(struct transport *transport,
int nr_heads, struct ref **to_fetch)
{
struct helper_data *data = transport->data;
int i, count;
+ get_helper(transport);
+
if (process_connect(transport, 0)) {
do_take_over(transport);
return transport->vtable->fetch(transport, nr_heads, to_fetch);
}
+ if (!data->get_refs_list_called)
+ get_refs_list_using_list(transport, 0);
+
count = 0;
for (i = 0; i < nr_heads; i++)
if (!(to_fetch[i]->status & REF_STATUS_UPTODATE))
set_helper_option(transport, "update-shallow", "true");
if (data->transport_options.filter_options.choice) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(
- &data->transport_options.filter_options,
- &expanded_filter_spec);
- set_helper_option(transport, "filter",
- expanded_filter_spec.buf);
- strbuf_release(&expanded_filter_spec);
+ const char *spec = expand_list_objects_filter_spec(
+ &data->transport_options.filter_options);
+ set_helper_option(transport, "filter", spec);
}
if (data->transport_options.negotiation_tips)
static struct ref *get_refs_list(struct transport *transport, int for_push,
const struct argv_array *ref_prefixes)
+{
+ get_helper(transport);
+
+ if (process_connect(transport, for_push)) {
+ do_take_over(transport);
+ return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+ }
+
+ return get_refs_list_using_list(transport, for_push);
+}
+
+static struct ref *get_refs_list_using_list(struct transport *transport,
+ int for_push)
{
struct helper_data *data = transport->data;
struct child_process *helper;
struct ref *posn;
struct strbuf buf = STRBUF_INIT;
+ data->get_refs_list_called = 1;
helper = get_helper(transport);
- if (process_connect(transport, for_push)) {
- do_take_over(transport);
- return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
- }
-
if (data->push && for_push)
write_str_in_full(helper->in, "list for-push\n");
else
}
static struct transport_vtable vtable = {
- 0,
set_helper_option,
get_refs_list,
fetch,
struct argv_array;
struct transport_vtable {
- /**
- * This transport supports the fetch() function being called
- * without get_refs_list() first being called.
- */
- unsigned fetch_without_list : 1;
-
/**
* Returns 0 if successful, positive if the option is not
* recognized or is inapplicable, and negative if the option
struct bundle_transport_data {
int fd;
struct bundle_header header;
+ unsigned get_refs_from_bundle_called : 1;
};
static struct ref *get_refs_from_bundle(struct transport *transport,
if (for_push)
return NULL;
+ data->get_refs_from_bundle_called = 1;
+
if (data->fd > 0)
close(data->fd);
data->fd = read_bundle_header(transport->url, &data->header);
int nr_heads, struct ref **to_fetch)
{
struct bundle_transport_data *data = transport->data;
+
+ if (!data->get_refs_from_bundle_called)
+ get_refs_from_bundle(transport, 0, NULL);
return unbundle(the_repository, &data->header, data->fd,
transport->progress ? BUNDLE_VERBOSE : 0);
}
opts->no_dependents = !!value;
return 0;
} else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) {
+ list_objects_filter_die_if_populated(&opts->filter_options);
parse_list_objects_filter(&opts->filter_options, value);
return 0;
}
}
static struct transport_vtable taken_over_vtable = {
- 1,
NULL,
get_refs_via_connect,
fetch_refs_via_pack,
}
static struct transport_vtable bundle_vtable = {
- 0,
NULL,
get_refs_from_bundle,
fetch_refs_from_bundle,
};
static struct transport_vtable builtin_smart_vtable = {
- 1,
NULL,
get_refs_via_connect,
fetch_refs_via_pack,
struct ref **heads = NULL;
struct ref *rm;
- if (!transport->vtable->fetch_without_list)
- /*
- * Some transports (e.g. the built-in bundle transport and the
- * transport helper interface) do not work when fetching is
- * done immediately after transport creation. List the remote
- * refs anyway (if not already listed) as a workaround.
- */
- transport_get_remote_refs(transport, NULL);
-
for (rm = refs; rm; rm = rm->next) {
nr_refs++;
if (rm->peer_ref &&
literal_copy:
return xstrdup(url);
}
-
-static void fill_alternate_refs_command(struct child_process *cmd,
- const char *repo_path)
-{
- const char *value;
-
- if (!git_config_get_value("core.alternateRefsCommand", &value)) {
- cmd->use_shell = 1;
-
- argv_array_push(&cmd->args, value);
- argv_array_push(&cmd->args, repo_path);
- } else {
- cmd->git_cmd = 1;
-
- argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path);
- argv_array_push(&cmd->args, "for-each-ref");
- argv_array_push(&cmd->args, "--format=%(objectname)");
-
- if (!git_config_get_value("core.alternateRefsPrefixes", &value)) {
- argv_array_push(&cmd->args, "--");
- argv_array_split(&cmd->args, value);
- }
- }
-
- cmd->env = local_repo_env;
- cmd->out = -1;
-}
-
-static void read_alternate_refs(const char *path,
- alternate_ref_fn *cb,
- void *data)
-{
- struct child_process cmd = CHILD_PROCESS_INIT;
- struct strbuf line = STRBUF_INIT;
- FILE *fh;
-
- fill_alternate_refs_command(&cmd, path);
-
- if (start_command(&cmd))
- return;
-
- fh = xfdopen(cmd.out, "r");
- while (strbuf_getline_lf(&line, fh) != EOF) {
- struct object_id oid;
- const char *p;
-
- if (parse_oid_hex(line.buf, &oid, &p) || *p) {
- warning(_("invalid line while parsing alternate refs: %s"),
- line.buf);
- break;
- }
-
- cb(&oid, data);
- }
-
- fclose(fh);
- finish_command(&cmd);
-}
-
-struct alternate_refs_data {
- alternate_ref_fn *fn;
- void *data;
-};
-
-static int refs_from_alternate_cb(struct object_directory *e,
- void *data)
-{
- struct strbuf path = STRBUF_INIT;
- size_t base_len;
- struct alternate_refs_data *cb = data;
-
- if (!strbuf_realpath(&path, e->path, 0))
- goto out;
- if (!strbuf_strip_suffix(&path, "/objects"))
- goto out;
- base_len = path.len;
-
- /* Is this a git repository with refs? */
- strbuf_addstr(&path, "/refs");
- if (!is_directory(path.buf))
- goto out;
- strbuf_setlen(&path, base_len);
-
- read_alternate_refs(path.buf, cb->fn, cb->data);
-
-out:
- strbuf_release(&path);
- return 0;
-}
-
-void for_each_alternate_ref(alternate_ref_fn fn, void *data)
-{
- struct alternate_refs_data cb;
- cb.fn = fn;
- cb.data = data;
- foreach_alt_odb(refs_from_alternate_cb, &cb);
-}
void transport_print_push_status(const char *dest, struct ref *refs,
int verbose, int porcelain, unsigned int *reject_reasons);
-typedef void alternate_ref_fn(const struct object_id *oid, void *);
-void for_each_alternate_ref(alternate_ref_fn, void *);
#endif
* diff_tree_oid(parent, commit) )
*/
for (i = 0; i < nparent; ++i)
- tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
- ttree = fill_tree_descriptor(&t, oid);
+ tptree[i] = fill_tree_descriptor(opt->repo, &tp[i], parents_oid[i]);
+ ttree = fill_tree_descriptor(opt->repo, &t, oid);
/* Enable recursion indefinitely */
opt->pathspec.recursive = opt->flags.recursive;
return result;
}
-void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
+void *fill_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const struct object_id *oid)
{
unsigned long size = 0;
void *buf = NULL;
if (oid) {
- buf = read_object_with_reference(oid, tree_type, &size, NULL);
+ buf = read_object_with_reference(r, oid, tree_type, &size, NULL);
if (!buf)
die("unable to read tree %s", oid_to_hex(oid));
}
void setup_traverse_info(struct traverse_info *info, const char *base)
{
- int pathlen = strlen(base);
+ size_t pathlen = strlen(base);
static struct traverse_info dummy;
memset(info, 0, sizeof(*info));
if (pathlen && base[pathlen-1] == '/')
pathlen--;
info->pathlen = pathlen ? pathlen + 1 : 0;
- info->name.path = base;
- info->name.pathlen = pathlen;
- if (pathlen) {
- hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1);
+ info->name = base;
+ info->namelen = pathlen;
+ if (pathlen)
info->prev = &dummy;
- }
}
-char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
+char *make_traverse_path(char *path, size_t pathlen,
+ const struct traverse_info *info,
+ const char *name, size_t namelen)
{
- int len = tree_entry_len(n);
- int pathlen = info->pathlen;
+ /* Always points to the end of the name we're about to add */
+ size_t pos = st_add(info->pathlen, namelen);
+
+ if (pos >= pathlen)
+ BUG("too small buffer passed to make_traverse_path");
- path[pathlen + len] = 0;
+ path[pos] = 0;
for (;;) {
- memcpy(path + pathlen, n->path, len);
- if (!pathlen)
+ if (pos < namelen)
+ BUG("traverse_info pathlen does not match strings");
+ pos -= namelen;
+ memcpy(path + pos, name, namelen);
+
+ if (!pos)
break;
- path[--pathlen] = '/';
- n = &info->name;
- len = tree_entry_len(n);
+ path[--pos] = '/';
+
+ if (!info)
+ BUG("traverse_info ran out of list items");
+ name = info->name;
+ namelen = info->namelen;
info = info->prev;
- pathlen -= len;
}
return path;
}
+void strbuf_make_traverse_path(struct strbuf *out,
+ const struct traverse_info *info,
+ const char *name, size_t namelen)
+{
+ size_t len = traverse_path_len(info, namelen);
+
+ strbuf_grow(out, len);
+ make_traverse_path(out->buf + out->len, out->alloc - out->len,
+ info, name, namelen);
+ strbuf_setlen(out, out->len + len);
+}
+
struct tree_desc_skip {
struct tree_desc_skip *prev;
const void *ptr;
tx[i].d = t[i];
if (info->prev) {
- strbuf_grow(&base, info->pathlen);
- make_traverse_path(base.buf, info->prev, &info->name);
- base.buf[info->pathlen-1] = '/';
- strbuf_setlen(&base, info->pathlen);
- traverse_path = xstrndup(base.buf, info->pathlen);
+ strbuf_make_traverse_path(&base, info->prev,
+ info->name, info->namelen);
+ strbuf_addch(&base, '/');
+ traverse_path = xstrndup(base.buf, base.len);
} else {
- traverse_path = xstrndup(info->name.path, info->pathlen);
+ traverse_path = xstrndup(info->name, info->pathlen);
}
info->traverse_path = traverse_path;
for (;;) {
struct object_id oid;
};
-static int find_tree_entry(struct tree_desc *t, const char *name, struct object_id *result, unsigned short *mode)
+static int find_tree_entry(struct repository *r, struct tree_desc *t,
+ const char *name, struct object_id *result,
+ unsigned short *mode)
{
int namelen = strlen(name);
while (t->size) {
oidcpy(result, &oid);
return 0;
}
- return get_tree_entry(&oid, name + entrylen, result, mode);
+ return get_tree_entry(r, &oid, name + entrylen, result, mode);
}
return -1;
}
-int get_tree_entry(const struct object_id *tree_oid, const char *name, struct object_id *oid, unsigned short *mode)
+int get_tree_entry(struct repository *r,
+ const struct object_id *tree_oid,
+ const char *name,
+ struct object_id *oid,
+ unsigned short *mode)
{
int retval;
void *tree;
unsigned long size;
struct object_id root;
- tree = read_object_with_reference(tree_oid, tree_type, &size, &root);
+ tree = read_object_with_reference(r, tree_oid, tree_type, &size, &root);
if (!tree)
return -1;
} else {
struct tree_desc t;
init_tree_desc(&t, tree, size);
- retval = find_tree_entry(&t, name, oid, mode);
+ retval = find_tree_entry(r, &t, name, oid, mode);
}
free(tree);
return retval;
* See the code for enum get_oid_result for a description of
* the return values.
*/
-enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode)
+enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r,
+ struct object_id *tree_oid, const char *name,
+ struct object_id *result, struct strbuf *result_path,
+ unsigned short *mode)
{
int retval = MISSING_OBJECT;
struct dir_state *parents = NULL;
void *tree;
struct object_id root;
unsigned long size;
- tree = read_object_with_reference(¤t_tree_oid,
+ tree = read_object_with_reference(r,
+ ¤t_tree_oid,
tree_type, &size,
&root);
if (!tree)
}
/* Look up the first (or only) path component in the tree. */
- find_result = find_tree_entry(&t, namebuf.buf,
+ find_result = find_tree_entry(r, &t, namebuf.buf,
¤t_tree_oid, mode);
if (find_result) {
goto done;
*/
retval = DANGLING_SYMLINK;
- contents = read_object_file(¤t_tree_oid, &type,
+ contents = repo_read_object_file(r,
+ ¤t_tree_oid, &type,
&link_len);
if (!contents)
int tree_entry(struct tree_desc *, struct name_entry *);
int tree_entry_gently(struct tree_desc *, struct name_entry *);
-void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
+void *fill_tree_descriptor(struct repository *r,
+ struct tree_desc *desc,
+ const struct object_id *oid);
struct traverse_info;
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info);
-enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
+enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r, struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
struct traverse_info {
const char *traverse_path;
struct traverse_info *prev;
- struct name_entry name;
- int pathlen;
+ const char *name;
+ size_t namelen;
+ unsigned mode;
+
+ size_t pathlen;
struct pathspec *pathspec;
unsigned long df_conflicts;
int show_all_errors;
};
-int get_tree_entry(const struct object_id *, const char *, struct object_id *, unsigned short *);
-char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
+int get_tree_entry(struct repository *, const struct object_id *, const char *, struct object_id *, unsigned short *);
+char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info,
+ const char *name, size_t namelen);
+void strbuf_make_traverse_path(struct strbuf *out,
+ const struct traverse_info *info,
+ const char *name, size_t namelen);
void setup_traverse_info(struct traverse_info *info, const char *base);
-static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+static inline size_t traverse_path_len(const struct traverse_info *info,
+ size_t namelen)
{
- return info->pathlen + tree_entry_len(n);
+ return st_add(info->pathlen, namelen);
}
/* in general, positive means "kind of interesting" */
struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(r, oid->hash);
+ struct object *obj = lookup_object(r, oid);
if (!obj)
- return create_object(r, oid->hash,
- alloc_tree_node(r));
+ return create_object(r, oid, alloc_tree_node(r));
return object_as_type(r, obj, OBJ_TREE, 0);
}
#include "submodule-config.h"
#include "fsmonitor.h"
#include "object-store.h"
-#include "fetch-object.h"
+#include "promisor-remote.h"
/*
* Error messages expected by scripts out of plumbing commands such as
total++;
}
- return start_delayed_progress(_("Checking out files"), total);
+ return start_delayed_progress(_("Updating files"), total);
}
static void setup_collided_checkout_detection(struct checkout *state,
load_gitmodules_file(index, &state);
enable_delayed_checkout(&state);
- if (repository_format_partial_clone && o->update && !o->dry_run) {
+ if (has_promisor_remote() && o->update && !o->dry_run) {
/*
* Prefetch the objects that are to be checked out in the loop
* below.
oid_array_append(&to_fetch, &ce->oid);
}
if (to_fetch.nr)
- fetch_objects(repository_format_partial_clone,
- to_fetch.oid, to_fetch.nr);
+ promisor_remote_get_direct(the_repository,
+ to_fetch.oid, to_fetch.nr);
oid_array_clear(&to_fetch);
}
for (i = 0; i < index->cache_nr; i++) {
return ret;
}
-static int find_cache_pos(struct traverse_info *, const struct name_entry *);
+static int find_cache_pos(struct traverse_info *, const char *p, size_t len);
static void restore_cache_bottom(struct traverse_info *info, int bottom)
{
if (o->diff_index_cached)
return 0;
ret = o->cache_bottom;
- pos = find_cache_pos(info->prev, &info->name);
+ pos = find_cache_pos(info->prev, info->name, info->namelen);
if (pos < -1)
o->cache_bottom = -2 - pos;
struct traverse_info *info)
{
struct unpack_trees_options *o = info->data;
- int len = traverse_path_len(info, names);
- char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */);
+ struct strbuf name = STRBUF_INIT;
int pos;
- make_traverse_path(name, info, names);
- name[len++] = '/';
- name[len] = '\0';
- pos = index_name_pos(o->src_index, name, len);
+ strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
+ strbuf_addch(&name, '/');
+ pos = index_name_pos(o->src_index, name.buf, name.len);
if (pos >= 0)
BUG("This is a directory and should not exist in index");
pos = -pos - 1;
- if (!starts_with(o->src_index->cache[pos]->name, name) ||
- (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name)))
+ if (!starts_with(o->src_index->cache[pos]->name, name.buf) ||
+ (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
BUG("pos must point at the first entry in this directory");
- free(name);
+ strbuf_release(&name);
return pos;
}
newinfo = *info;
newinfo.prev = info;
newinfo.pathspec = info->pathspec;
- newinfo.name = *p;
- newinfo.pathlen += tree_entry_len(p) + 1;
+ newinfo.name = p->path;
+ newinfo.namelen = p->pathlen;
+ newinfo.mode = p->mode;
+ newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1);
newinfo.df_conflicts |= df_conflicts;
/*
const struct object_id *oid = NULL;
if (dirmask & 1)
oid = &names[i].oid;
- buf[nr_buf++] = fill_tree_descriptor(t + i, oid);
+ buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid);
}
}
* itself - the caller needs to do the final check for the cache
* entry having more data at the end!
*/
-static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
+static int do_compare_entry_piecewise(const struct cache_entry *ce,
+ const struct traverse_info *info,
+ const char *name, size_t namelen,
+ unsigned mode)
{
- int len, pathlen, ce_len;
+ int pathlen, ce_len;
const char *ce_name;
if (info->prev) {
int cmp = do_compare_entry_piecewise(ce, info->prev,
- &info->name);
+ info->name, info->namelen,
+ info->mode);
if (cmp)
return cmp;
}
ce_len -= pathlen;
ce_name = ce->name + pathlen;
- len = tree_entry_len(n);
- return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+ return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
}
static int do_compare_entry(const struct cache_entry *ce,
const struct traverse_info *info,
- const struct name_entry *n)
+ const char *name, size_t namelen,
+ unsigned mode)
{
- int len, pathlen, ce_len;
+ int pathlen, ce_len;
const char *ce_name;
int cmp;
* it is quicker to use the precomputed version.
*/
if (!info->traverse_path)
- return do_compare_entry_piecewise(ce, info, n);
+ return do_compare_entry_piecewise(ce, info, name, namelen, mode);
cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
if (cmp)
ce_len -= pathlen;
ce_name = ce->name + pathlen;
- len = tree_entry_len(n);
- return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
+ return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
}
static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
{
- int cmp = do_compare_entry(ce, info, n);
+ int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode);
if (cmp)
return cmp;
* Even if the beginning compared identically, the ce should
* compare as bigger than a directory leading up to it!
*/
- return ce_namelen(ce) > traverse_path_len(info, n);
+ return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
}
static int ce_in_traverse_path(const struct cache_entry *ce,
{
if (!info->prev)
return 1;
- if (do_compare_entry(ce, info->prev, &info->name))
+ if (do_compare_entry(ce, info->prev,
+ info->name, info->namelen, info->mode))
return 0;
/*
* If ce (blob) is the same name as the path (which is a tree
struct index_state *istate,
int is_transient)
{
- int len = traverse_path_len(info, n);
+ size_t len = traverse_path_len(info, tree_entry_len(n));
struct cache_entry *ce =
is_transient ?
make_empty_transient_cache_entry(len) :
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
oidcpy(&ce->oid, &n->oid);
- make_traverse_path(ce->name, info, n);
+ /* len+1 because the cache_entry allocates space for NUL */
+ make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
return ce;
}
* the directory.
*/
static int find_cache_pos(struct traverse_info *info,
- const struct name_entry *p)
+ const char *p, size_t p_len)
{
int pos;
struct unpack_trees_options *o = info->data;
struct index_state *index = o->src_index;
int pfxlen = info->pathlen;
- int p_len = tree_entry_len(p);
for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
const struct cache_entry *ce = index->cache[pos];
ce_len = ce_slash - ce_name;
else
ce_len = ce_namelen(ce) - pfxlen;
- cmp = name_compare(p->path, p_len, ce_name, ce_len);
+ cmp = name_compare(p, p_len, ce_name, ce_len);
/*
* Exact match; if we have a directory we need to
* delay returning it.
* E.g. ce_name == "t-i", and p->path == "t"; we may
* have "t/a" in the index.
*/
- if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
+ if (p_len < ce_len && !memcmp(ce_name, p, p_len) &&
ce_name[p_len] < '/')
continue; /* keep looking */
break;
static struct cache_entry *find_cache_entry(struct traverse_info *info,
const struct name_entry *p)
{
- int pos = find_cache_pos(info, p);
+ int pos = find_cache_pos(info, p->path, p->pathlen);
struct unpack_trees_options *o = info->data;
if (0 <= pos)
{
if (info->prev) {
debug_path(info->prev);
- if (*info->prev->name.path)
+ if (*info->prev->name)
putchar('/');
}
- printf("%s", info->name.path);
+ printf("%s", info->name);
}
static void debug_name_entry(int i, struct name_entry *n)
argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag)
argv_array_push(&pack_objects.args, "--include-tag");
- if (filter_options.filter_spec) {
- struct strbuf expanded_filter_spec = STRBUF_INIT;
- expand_list_objects_filter_spec(&filter_options,
- &expanded_filter_spec);
+ if (filter_options.choice) {
+ const char *spec =
+ expand_list_objects_filter_spec(&filter_options);
if (pack_objects.use_shell) {
struct strbuf buf = STRBUF_INIT;
- sq_quote_buf(&buf, expanded_filter_spec.buf);
+ sq_quote_buf(&buf, spec);
argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
strbuf_release(&buf);
} else {
argv_array_pushf(&pack_objects.args, "--filter=%s",
- expanded_filter_spec.buf);
+ spec);
}
}
return -1;
while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
- struct object_id sha1;
+ struct object_id oid;
const char *p;
- if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
+ if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
break;
- o = lookup_object(the_repository, sha1.hash);
+ o = lookup_object(the_repository, &oid);
if (o && o->type == OBJ_COMMIT) {
o->flags &= ~TMP_MARK;
}
if (skip_prefix(reader->line, "filter ", &arg)) {
if (!filter_capability_requested)
die("git upload-pack: filtering capability not negotiated");
+ list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, arg);
continue;
}
static int mark_our_ref(const char *refname, const char *refname_full,
const struct object_id *oid)
{
- struct object *o = lookup_unknown_object(oid->hash);
+ struct object *o = lookup_unknown_object(oid);
if (ref_is_hidden(refname, refname_full)) {
o->flags |= HIDDEN_REF;
}
if (allow_filter && skip_prefix(arg, "filter ", &p)) {
+ list_objects_filter_die_if_populated(&filter_options);
parse_list_objects_filter(&filter_options, p);
continue;
}
return url_decode_internal(&url, len, NULL, &out, 0);
}
+char *url_percent_decode(const char *encoded)
+{
+ struct strbuf out = STRBUF_INIT;
+ return url_decode_internal(&encoded, strlen(encoded), NULL, &out, 0);
+}
+
char *url_decode_parameter_name(const char **query)
{
struct strbuf out = STRBUF_INIT;
int is_urlschemechar(int first_flag, int ch);
char *url_decode(const char *url);
char *url_decode_mem(const char *url, int len);
+
+/*
+ * Similar to the url_decode_{,mem} methods above, but doesn't assume there
+ * is a scheme followed by a : at the start of the string. Instead, %-sequences
+ * before any : are also parsed.
+ */
+char *url_percent_decode(const char *encoded);
+
char *url_decode_parameter_name(const char **query);
char *url_decode_parameter_value(const char **query);
"[a-zA-Z][a-zA-Z0-9_]*"
"|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
+PATTERNS("dts",
+ "!;\n"
+ /* lines beginning with a word optionally preceded by '&' or the root */
+ "^[ \t]*((/|&?[a-zA-Z_]).*)",
+ /* -- */
+ /* Property names and math operators */
+ "[a-zA-Z0-9,._+?#-]+"
+ "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"),
IPATTERN("fortran",
"!^([C*]|[ \t]*!)\n"
"!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n"
"|[-+*/<>%&^|=!]="
"|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
PATTERNS("matlab",
- "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$",
+ /*
+ * Octave pattern is mostly the same as matlab, except that '%%%' and
+ * '##' can also be used to begin code sections, in addition to '%%'
+ * that is understood by both.
+ */
+ "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
"[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
PATTERNS("objc",
/* Negate C statements that can look like functions */
"(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
"|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"),
+PATTERNS("rust",
+ "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl)[< \t]+[^;]*)$",
+ /* -- */
+ "[a-zA-Z_][a-zA-Z0-9_]*"
+ "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
+ "|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
"[={}\"]|[^={}\" \t]+"),
PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
error("Could not interpret response from server '%s' as something to pull", target[i]);
goto done;
}
- if (process(walker, lookup_unknown_object(oids[i].hash)))
+ if (process(walker, lookup_unknown_object(&oids[i])))
goto done;
}
#include "cache.h"
#include "config.h"
-static void do_nothing(size_t size)
-{
-}
-
-static void (*try_to_free_routine)(size_t size) = do_nothing;
-
static int memory_limit_check(size_t size, int gentle)
{
static size_t limit = 0;
return 0;
}
-try_to_free_t set_try_to_free_routine(try_to_free_t routine)
-{
- try_to_free_t old = try_to_free_routine;
- if (!routine)
- routine = do_nothing;
- try_to_free_routine = routine;
- return old;
-}
-
char *xstrdup(const char *str)
{
char *ret = strdup(str);
- if (!ret) {
- try_to_free_routine(strlen(str) + 1);
- ret = strdup(str);
- if (!ret)
- die("Out of memory, strdup failed");
- }
+ if (!ret)
+ die("Out of memory, strdup failed");
return ret;
}
if (!ret && !size)
ret = malloc(1);
if (!ret) {
- try_to_free_routine(size);
- ret = malloc(size);
- if (!ret && !size)
- ret = malloc(1);
- if (!ret) {
- if (!gentle)
- die("Out of memory, malloc failed (tried to allocate %lu bytes)",
- (unsigned long)size);
- else {
- error("Out of memory, malloc failed (tried to allocate %lu bytes)",
- (unsigned long)size);
- return NULL;
- }
+ if (!gentle)
+ die("Out of memory, malloc failed (tried to allocate %lu bytes)",
+ (unsigned long)size);
+ else {
+ error("Out of memory, malloc failed (tried to allocate %lu bytes)",
+ (unsigned long)size);
+ return NULL;
}
}
#ifdef XMALLOC_POISON
ret = realloc(ptr, size);
if (!ret && !size)
ret = realloc(ptr, 1);
- if (!ret) {
- try_to_free_routine(size);
- ret = realloc(ptr, size);
- if (!ret && !size)
- ret = realloc(ptr, 1);
- if (!ret)
- die("Out of memory, realloc failed");
- }
+ if (!ret)
+ die("Out of memory, realloc failed");
return ret;
}
ret = calloc(nmemb, size);
if (!ret && (!nmemb || !size))
ret = calloc(1, 1);
- if (!ret) {
- try_to_free_routine(nmemb * size);
- ret = calloc(nmemb, size);
- if (!ret && (!nmemb || !size))
- ret = calloc(1, 1);
- if (!ret)
- die("Out of memory, calloc failed");
- }
+ if (!ret)
+ die("Out of memory, calloc failed");
return ret;
}
#include "lockfile.h"
#include "sequencer.h"
+#define AB_DELAY_WARNING_IN_MS (2 * 1000)
+
static const char cut_line[] =
"------------------------ >8 ------------------------\n";
return;
if (s->whence != FROM_COMMIT)
;
- else if (!s->is_initial)
- status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
- else
+ else if (!s->is_initial) {
+ if (!strcmp(s->reference, "HEAD"))
+ status_printf_ln(s, c,
+ _(" (use \"git restore --staged <file>...\" to unstage)"));
+ else
+ status_printf_ln(s, c,
+ _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
+ s->reference);
+ } else
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
if (!both_deleted) {
} else {
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
}
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_cached_header(struct wt_status *s)
return;
if (s->whence != FROM_COMMIT)
; /* NEEDSWORK: use "git reset --unresolve"??? */
- else if (!s->is_initial)
- status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
- else
+ else if (!s->is_initial) {
+ if (!strcmp(s->reference, "HEAD"))
+ status_printf_ln(s, c
+ , _(" (use \"git restore --staged <file>...\" to unstage)"));
+ else
+ status_printf_ln(s, c,
+ _(" (use \"git restore --source=%s --staged <file>...\" to unstage)"),
+ s->reference);
+ } else
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_dirty_header(struct wt_status *s,
status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
else
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
- status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
+ status_printf_ln(s, c, _(" (use \"git restore <file>...\" to discard changes in working directory)"));
if (has_dirty_submodules)
status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_other_header(struct wt_status *s,
if (!s->hints)
return;
status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
- status_printf_ln(s, c, "%s", "");
}
static void wt_longstatus_print_trailer(struct wt_status *s)
struct branch *branch;
char comment_line_string[3];
int i;
+ uint64_t t_begin = 0;
assert(s->branch && !s->is_initial);
if (!skip_prefix(s->branch, "refs/heads/", &branch_name))
return;
branch = branch_get(branch_name);
+
+ t_begin = getnanotime();
+
if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
return;
+ if (advice_status_ahead_behind_warning &&
+ s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
+ uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
+ if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
+ strbuf_addf(&sb, _("\n"
+ "It took %.2f seconds to compute the branch ahead/behind values.\n"
+ "You can use '--no-ahead-behind' to avoid this.\n"),
+ t_delta_in_ms / 1000.0);
+ }
+ }
+
i = 0;
if (s->display_comment_prefix) {
comment_line_string[i++] = comment_line_char;
} else if (s->state.detached_from) {
branch_name = s->state.detached_from;
if (s->state.detached_at)
- on_what = _("HEAD detached at ");
+ on_what = HEAD_DETACHED_AT;
else
- on_what = _("HEAD detached from ");
+ on_what = HEAD_DETACHED_FROM;
} else {
branch_name = "";
on_what = _("Not currently on any branch.");
/*
* Fix-up changed entries before we print them.
*/
-static void wt_porcelain_v2_fix_up_changed(
- struct string_list_item *it,
- struct wt_status *s)
+static void wt_porcelain_v2_fix_up_changed(struct string_list_item *it)
{
struct wt_status_change_data *d = it->util;
char submodule_token[5];
char sep_char, eol_char;
- wt_porcelain_v2_fix_up_changed(it, s);
+ wt_porcelain_v2_fix_up_changed(it);
wt_porcelain_v2_submodule_state(d, submodule_token);
key[0] = d->index_status ? d->index_status : '.';
STATUS_FORMAT_UNSPECIFIED
};
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
struct wt_status_state {
int merge_in_progress;
int am_in_progress;
projects / thirdparty / git.git / commitdiff
